feat(client): introduce komorebi-client crate

This commit introduces the komorebi-client library crate for other Rust applications to interact with a running instance of komorebi over Unix Domain Sockets. Currently the crate re-exports everything one might find in the komorebi::State struct and everything that is publicly exposed in komorebi-core. Public types and methods are still lacking documentation, and this crate should not be published on crates.io until this is no longer the case.
2026-02-17 10:47:42 +01:00 · 2024-02-26 18:15:40 -08:00
68 changed files with 1429 additions and 2649 deletions
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -73,11 +73,6 @@ jobs:
      - name: Install the target
        run: |
          rustup target install ${{ matrix.target }}
-      - name: Run Cargo checks
-        run: |
-          cargo fmt --check
-          cargo check
-          cargo clippy
      - name: Run a full build
        run: |
          cargo build --locked --release --target ${{ matrix.target }}
@@ -98,11 +93,6 @@ jobs:
            target/${{ matrix.target }}/release/komorebic-no-console.pdb
            target/wix/komorebi-*.msi
          retention-days: 7
-      - name: Check GoReleaser
-        uses: goreleaser/goreleaser-action@v3
-        with:
-          version: latest
-          args: build --skip=validate --clean

      # Release
      - name: Generate changelog
@@ -116,12 +106,12 @@ jobs:
        if: startsWith(github.ref, 'refs/tags/v')
        with:
          version: latest
-          args: release --skip=validate --clean --release-notes=CHANGELOG.md
+          args: release --skip-validate --clean --release-notes=CHANGELOG.md
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          SCOOP_TOKEN: ${{ secrets.SCOOP_TOKEN }}
      - name: Add MSI to release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        if: startsWith(github.ref, 'refs/tags/v')
        with:
          files: "target/wix/komorebi-*.msi"
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@
 /target
 CHANGELOG.md
 dummy.go
-komorebi.ahk
-komorebic/applications.yaml
+komorebi.ahk
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,15 +11,14 @@ members = [
 ]

 [workspace.dependencies]
-windows-interface = { version = "0.53" }
-windows-implement = { version = "0.53" }
+windows-interface = { version = "0.52" }
+windows-implement = { version = "0.52" }
 dunce = "1"
 dirs = "5"
 color-eyre = "0.6"
-serde_json = { package = "serde_json_lenient", version = "0.1" }

 [workspace.dependencies.windows]
-version = "0.54"
+version = "0.52"
 features = [
    "implement",
    "Win32_System_Com",
--- a/README.md
+++ b/README.md
@@ -324,7 +324,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.23"}
+// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.22"}

 use anyhow::Result;
 use komorebi_client::Notification;
--- a/docs/cli/alt-focus-hack.md
+++ b/docs/cli/alt-focus-hack.md
@@ -0,0 +1,16 @@
+# alt-focus-hack
+
+```
+Enable or disable a hack simulating ALT key presses to ensure focus changes succeed
+
+Usage: komorebic.exe alt-focus-hack <BOOLEAN_STATE>
+
+Arguments:
+  <BOOLEAN_STATE>
+          [possible values: enable, disable]
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/change-layout.md
+++ b/docs/cli/change-layout.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe change-layout <DEFAULT_LAYOUT>

 Arguments:
  <DEFAULT_LAYOUT>
-          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack, grid]
+          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack]

 Options:
  -h, --help
--- a/docs/cli/check.md
+++ b/docs/cli/check.md
@@ -1,7 +1,7 @@
 # check

 ```
-Check komorebi configuration and related files for common errors
+Output various important komorebi-related environment values

 Usage: komorebic.exe check

--- a/docs/cli/configuration.md
+++ b/docs/cli/configuration.md
@@ -1,12 +0,0 @@
-# configuration
-
-```
-Show the path to komorebi.json
-
-Usage: komorebic.exe configuration
-
-Options:
-  -h, --help
-          Print help
-
-```
--- a/docs/cli/docgen.md
+++ b/docs/cli/docgen.md
@@ -0,0 +1,10 @@
+# docgen
+
+```
+Usage: komorebic.exe docgen
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/float-rule.md
+++ b/docs/cli/float-rule.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe float-rule <IDENTIFIER> <ID>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/identify-border-overflow-application.md
+++ b/docs/cli/identify-border-overflow-application.md
@@ -0,0 +1,19 @@
+# identify-border-overflow-application
+
+```
+Identify an application that has overflowing borders
+
+Usage: komorebic.exe identify-border-overflow-application <IDENTIFIER> <ID>
+
+Arguments:
+  <IDENTIFIER>
+          [possible values: exe, class, title]
+
+  <ID>
+          Identifier as a string
+
+Options:
+  -h, --help
+          Print help
+
+```
--- a/docs/cli/identify-layered-application.md
+++ b/docs/cli/identify-layered-application.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe identify-layered-application <IDENTIFIER> <ID>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/identify-object-name-change-application.md
+++ b/docs/cli/identify-object-name-change-application.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe identify-object-name-change-application <IDENTIFIER> <ID>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/identify-tray-application.md
+++ b/docs/cli/identify-tray-application.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe identify-tray-application <IDENTIFIER> <ID>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/initial-named-workspace-rule.md
+++ b/docs/cli/initial-named-workspace-rule.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe initial-named-workspace-rule <IDENTIFIER> <ID> <WORKSPACE>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/initial-workspace-rule.md
+++ b/docs/cli/initial-workspace-rule.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe initial-workspace-rule <IDENTIFIER> <ID> <MONITOR> <WORKSPA

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/manage-rule.md
+++ b/docs/cli/manage-rule.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe manage-rule <IDENTIFIER> <ID>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/named-workspace-layout-rule.md
+++ b/docs/cli/named-workspace-layout-rule.md
@@ -13,7 +13,7 @@ Arguments:
          The number of window containers on-screen required to trigger this layout rule

  <LAYOUT>
-          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack, grid]
+          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack]

 Options:
  -h, --help
--- a/docs/cli/named-workspace-layout.md
+++ b/docs/cli/named-workspace-layout.md
@@ -10,7 +10,7 @@ Arguments:
          Target workspace name

  <VALUE>
-          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack, grid]
+          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack]

 Options:
  -h, --help
--- a/docs/cli/named-workspace-rule.md
+++ b/docs/cli/named-workspace-rule.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe named-workspace-rule <IDENTIFIER> <ID> <WORKSPACE>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/remove-title-bar.md
+++ b/docs/cli/remove-title-bar.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe remove-title-bar <IDENTIFIER> <ID>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/cli/subscribe-socket.md
+++ b/docs/cli/subscribe-socket.md
@@ -1,16 +0,0 @@
-# subscribe-socket
-
-```
-Subscribe to komorebi events using a Unix Domain Socket
-
-Usage: komorebic.exe subscribe-socket <SOCKET>
-
-Arguments:
-  <SOCKET>
-          Name of the socket to send event notifications to
-
-Options:
-  -h, --help
-          Print help
-
-```
--- a/docs/cli/subscribe-pipe.md
+++ b/docs/cli/subscribe-pipe.md
@@ -1,9 +1,9 @@
-# subscribe-pipe
+# subscribe

 ```
-Subscribe to komorebi events using a Named Pipe
+Subscribe to komorebi events

-Usage: komorebic.exe subscribe-pipe <NAMED_PIPE>
+Usage: komorebic.exe subscribe <NAMED_PIPE>

 Arguments:
  <NAMED_PIPE>
--- a/docs/cli/unsubscribe-socket.md
+++ b/docs/cli/unsubscribe-socket.md
@@ -1,16 +0,0 @@
-# unsubscribe-socket
-
-```
-Unsubscribe from komorebi events
-
-Usage: komorebic.exe unsubscribe-socket <SOCKET>
-
-Arguments:
-  <SOCKET>
-          Name of the socket to stop sending event notifications to
-
-Options:
-  -h, --help
-          Print help
-
-```
--- a/docs/cli/unsubscribe-pipe.md
+++ b/docs/cli/unsubscribe-pipe.md
@@ -1,9 +1,9 @@
-# unsubscribe-pipe
+# unsubscribe

 ```
 Unsubscribe from komorebi events

-Usage: komorebic.exe unsubscribe-pipe <NAMED_PIPE>
+Usage: komorebic.exe unsubscribe <NAMED_PIPE>

 Arguments:
  <NAMED_PIPE>
--- a/docs/cli/whkdrc.md
+++ b/docs/cli/whkdrc.md
@@ -1,12 +0,0 @@
-# whkdrc
-
-```
-Show the path to whkdrc
-
-Usage: komorebic.exe whkdrc
-
-Options:
-  -h, --help
-          Print help
-
-```
--- a/docs/cli/workspace-layout-rule.md
+++ b/docs/cli/workspace-layout-rule.md
@@ -16,7 +16,7 @@ Arguments:
          The number of window containers on-screen required to trigger this layout rule

  <LAYOUT>
-          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack, grid]
+          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack]

 Options:
  -h, --help
--- a/docs/cli/workspace-layout.md
+++ b/docs/cli/workspace-layout.md
@@ -13,7 +13,7 @@ Arguments:
          Workspace index on the specified monitor (zero-indexed)

  <VALUE>
-          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack, grid]
+          [possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack]

 Options:
  -h, --help
--- a/docs/cli/workspace-rule.md
+++ b/docs/cli/workspace-rule.md
@@ -7,7 +7,7 @@ Usage: komorebic.exe workspace-rule <IDENTIFIER> <ID> <MONITOR> <WORKSPACE>

 Arguments:
  <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]

  <ID>
          Identifier as a string
--- a/docs/common-workflows/active-window-border.md
+++ b/docs/common-workflows/active-window-border.md
@@ -7,7 +7,6 @@ file.
 ```json
 {
  "active_window_border": true,
-  "active_window_border_style": "Rounded",
  "active_window_border_colours": {
    "single": {
      "r": 66,
@@ -24,7 +23,7 @@ file.
      "g": 51,
      "b": 153
    }
-  },
+  }
 }

 ```
@@ -32,7 +31,7 @@ file.
 It is important to note that the active window border will only apply to
 windows managed by `komorebi`.

-This feature is not considered stable, and you may encounter visual artifacts
+This feature is not considered stable and you may encounter visual artifacts
 from time to time.

 [![Watch the tutorial
--- a/docs/common-workflows/remove-gaps.md
+++ b/docs/common-workflows/remove-gaps.md
@@ -2,15 +2,13 @@

 If you would like to remove all gaps by default, both between windows
 themselves, and between the monitor edges and the windows, you can set the
-following configuration options to `0` and `-1` in the `komorebi.json`
-configuration file.
+following two configuration options to `0` in the `komorebi.json` configuration
+file.

 ```json
 {
  "default_workspace_padding": 0,
-  "default_container_padding": 0,
-  "border_width": 0,
-  "border_offset": -1
+  "default_container_padding": 0
 }
 ```

--- a/docs/common-workflows/stackbar.md
+++ b/docs/common-workflows/stackbar.md
@@ -1,23 +0,0 @@
-# Stackbar
-
-If you would like to add a visual stackbar to show which windows are in a container
-stack ensure the following options are defined in the `komorebi.json` configuration
-file.
-
-```json
-{
-  "stackbar": {
-    "height": 40,
-    "mode": "OnStack",
-    "tabs": {
-      "width": 300,
-      "focused_text": "#00a542",
-      "unfocused_text": "#b3b3b3",
-      "background": "#141414"
-    }
-  }
-}
-```
-
-This feature is not considered stable, and you may encounter visual artifacts
-from time to time.
--- a/docs/example-configurations.md
+++ b/docs/example-configurations.md
@@ -16,12 +16,6 @@ the example files have been downloaded. For most new users this will be in the
 komorebic quickstart
 ```

-With the example configurations downloaded, you can now start `komorebi` and `whkd.
-
-```powershell
-komorebic start --whkd
-```
-
 ## komorebi.json

 The example window manager configuration sets some sane defaults and provides
@@ -145,19 +139,6 @@ If you have an ultrawide monitor, I recommend using this layout.
 +-----+-----------+-----+
 ```

-### Grid
-If you like the `grid` layout in [LeftWM](https://github.com/leftwm/leftwm-layouts) this is almost exactly the same!
-
-```
-+-----+-----+   +---+---+---+   +---+---+---+   +---+---+---+
-|     |     |   |   |   |   |   |   |   |   |   |   |   |   |
-|     |     |   |   |   |   |   |   |   |   |   |   |   +---+
-+-----+-----+   |   +---+---+   +---+---+---+   +---+---|   |
-|     |     |   |   |   |   |   |   |   |   |   |   |   +---+
-|     |     |   |   |   |   |   |   |   |   |   |   |   |   |
-+-----+-----+   +---+---+---+   +---+---+---+   +---+---+---+
-  4 windows       5 windows       6 windows       7 windows
-```

 ## whkdrc

--- a/docs/installation.md
+++ b/docs/installation.md
@@ -33,7 +33,6 @@ it from [source](https://github.com/LGUG2Z/komorebi) if you would prefer.
 - [Scoop](#scoop)
 - [WinGet](#winget)
 - [Building from source](#building-from-source)
- - [Offline](#offline)

 ## Long path support

@@ -112,12 +111,3 @@ cargo +stable install --path komorebic-no-console --locked

 If the binaries have been built and added to your `$PATH` correctly, you should
 see some output when running `komorebi --help` and `komorebic --help`
-
-### Offline
-
-Download the latest [komorebi](https://github.com/LGUG2Z/komorebi/releases)
-and [whkd](https://github.com/LGUG2Z/whkd/releases) MSI installers on an internet-connected computer, then copy them to
-an offline machine to install.
-
-Once installed, proceed to get the [example configurations](example-configurations.md) (none of the commands for
-first-time set up and running komorebi require an internet connection).
--- a/docs/komorebi.example.json
+++ b/docs/komorebi.example.json
@@ -1,41 +1,24 @@
 {
-  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.23/schema.json",
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.20/schema.json",
  "app_specific_configuration_path": "$Env:USERPROFILE/applications.yaml",
  "window_hiding_behaviour": "Cloak",
  "cross_monitor_move_behaviour": "Insert",
  "default_workspace_padding": 20,
  "default_container_padding": 20,
-  "border_padding": 8,
-  "border_offset": -1,
  "active_window_border": false,
  "active_window_border_colours": {
-    "single": "#42a5f5",
-    "stack": "#00a542",
-    "monocle": "#ff3399"
+    "single": { "r": 66, "g": 165, "b": 245 },
+    "stack": { "r": 256, "g": 165, "b": 66 },
+    "monocle": { "r": 255, "g": 51, "b": 153 }
  },
  "monitors": [
    {
      "workspaces": [
-        {
-          "name": "I",
-          "layout": "BSP"
-        },
-        {
-          "name": "II",
-          "layout": "VerticalStack"
-        },
-        {
-          "name": "III",
-          "layout": "HorizontalStack"
-        },
-        {
-          "name": "IV",
-          "layout": "UltrawideVerticalStack"
-        },
-        {
-          "name": "V",
-          "layout": "Rows"
-        }
+        { "name": "I", "layout": "BSP" },
+        { "name": "II", "layout": "VerticalStack" },
+        { "name": "III", "layout": "HorizontalStack" },
+        { "name": "IV", "layout": "UltrawideVerticalStack" },
+        { "name": "V", "layout": "Rows" }
      ]
    }
  ]
--- a/docs/release/v0-1-22.md
+++ b/docs/release/v0-1-22.md
@@ -1,56 +0,0 @@
-In addition to the [changelog](https://github.com/LGUG2Z/komorebi/releases/tag/v0.1.22) of new features and fixes,
-please note the following changes from `v0.1.21` to adjust your configuration files accordingly.
-
-## tl;dr
-
-The way windows are sized and drawn has been improved to remove the need to manually specify and remove invisible
-borders for applications that overflow them. If you use the active window border, the first time you launch `v0.1.22`
-you may end up with a _huge_ border due to these changes.
-
-`active_window_border_width` and `active_window_border_offset` have been renamed to `border_width` and `border_offset`
-as they now also apply outside the context of the active window border.
-
-```json
-{
-  "active_window_border": true,
-  "border_width": 8,
-  "border_offset": -1
-}
-```
-
-Users of the active window border should start from these settings and read the notes below before making further
-adjustments.
-
-## Changes to `active_window_border`, and window sizing:
-
- The border no longer creates a second drop-shadow around the active window
- Windows are now sized to fill the layout region entirely, ignoring window decorations such as drop shadows
- Border offset now starts exactly at the paint edge of the window on all sides
- Windows are sized such that the border offset and border width are taken into account
-
-## Recommended patterns
-
-### Gapless
-
- Disable "transparency effects" Personalization > Colors
- Set the following settings in `komorebi.json`:
-```json
-{
-  "default_workspace_padding": 0,
-  "default_container_padding": 0,
-  "border_offset": -1,
-  "border_width": 0
-}
-```
-
-### 1px border
-
-A 1px border is drawn around the window edge. Users may see a gap for a single pixel, if the system theme has a
-transparent edge - this is the windows themed edge, and is not present for all applications.
-
-```json
-  {
-  "border_offset": 0,
-  "border_width": 1
-}
-```
--- a/4
+++ b/4
@@ -51,6 +51,10 @@ docgen:
    komorebic docgen
    Get-ChildItem -Path "docs/cli" -Recurse -File | ForEach-Object { (Get-Content $_.FullName) -replace 'Usage: ', 'Usage: komorebic.exe ' | Set-Content $_.FullName }

+exampledocs:
+    cp whkdrc.sample docs/whkdrc.sample
+    cp komorebi.example.json docs/komorebi.example.json
+
 schemagen:
    komorebic static-config-schema > schema.json
    generate-schema-doc .\schema.json --config template_name=js_offline --config minify=false .\static-config-docs\
--- a/komorebi-client/Cargo.toml
+++ b/komorebi-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-client"
-version = "0.1.23"
+version = "0.1.22-dev.0"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,4 +9,4 @@ edition = "2021"
 komorebi = { path = "../komorebi" }
 komorebi-core = { path = "../komorebi-core" }
 uds_windows = "1"
-serde_json = { workspace = true }
+serde_json = "1"
--- a/komorebi-core/Cargo.toml
+++ b/komorebi-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-core"
-version = "0.1.23"
+version = "0.1.22-dev.0"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 clap = { version = "4", features = ["derive"] }
 serde = { version = "1", features = ["derive"] }
-serde_json = { workspace = true }
+serde_json = "1"
 serde_yaml = "0.9"
 strum = { version = "0.26", features = ["derive"] }
 schemars = "0.8"
--- a/komorebi-core/src/config_generation.rs
+++ b/komorebi-core/src/config_generation.rs
@@ -8,17 +8,15 @@ use strum::EnumString;

 use crate::ApplicationIdentifier;

-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum ApplicationOptions {
    ObjectNameChange,
    Layered,
+    BorderOverflow,
    TrayAndMultiWindow,
    Force,
-    BorderOverflow,
 }

 impl ApplicationOptions {
@@ -31,15 +29,15 @@ impl ApplicationOptions {
            ApplicationOptions::Layered => {
                format!("komorebic.exe identify-layered-application {kind} \"{id}\"",)
            }
+            ApplicationOptions::BorderOverflow => {
+                format!("komorebic.exe identify-border-overflow-application {kind} \"{id}\"",)
+            }
            ApplicationOptions::TrayAndMultiWindow => {
                format!("komorebic.exe identify-tray-application {kind} \"{id}\"",)
            }
            ApplicationOptions::Force => {
                format!("komorebic.exe manage-rule {kind} \"{id}\"")
            }
-            ApplicationOptions::BorderOverflow => {
-                unreachable!("deprecated");
-            }
        }
    }

@@ -52,13 +50,6 @@ impl ApplicationOptions {
    }
 }

-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub enum MatchingRule {
-    Simple(IdWithIdentifier),
-    Composite(Vec<IdWithIdentifier>),
-}
-
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
 pub struct IdWithIdentifier {
    pub kind: ApplicationIdentifier,
@@ -75,10 +66,6 @@ pub enum MatchingStrategy {
    EndsWith,
    Contains,
    Regex,
-    DoesNotEndWith,
-    DoesNotStartWith,
-    DoesNotEqual,
-    DoesNotContain,
 }

 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
@@ -108,14 +95,14 @@ pub struct ApplicationConfiguration {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub options: Option<Vec<ApplicationOptions>>,
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub float_identifiers: Option<Vec<MatchingRule>>,
+    pub float_identifiers: Option<Vec<IdWithIdentifierAndComment>>,
 }

 impl ApplicationConfiguration {
    pub fn populate_default_matching_strategies(&mut self) {
        if self.identifier.matching_strategy.is_none() {
            match self.identifier.kind {
-                ApplicationIdentifier::Exe | ApplicationIdentifier::Path => {
+                ApplicationIdentifier::Exe => {
                    self.identifier.matching_strategy = Option::from(MatchingStrategy::Equals);
                }
                ApplicationIdentifier::Class | ApplicationIdentifier::Title => {}
@@ -194,21 +181,19 @@ impl ApplicationConfigurationGenerator {
            }

            if let Some(float_identifiers) = app.float_identifiers {
-                for matching_rule in float_identifiers {
-                    if let MatchingRule::Simple(float) = matching_rule {
-                        let float_rule =
-                            format!("komorebic.exe float-rule {} \"{}\"", float.kind, float.id);
+                for float in float_identifiers {
+                    let float_rule =
+                        format!("komorebic.exe float-rule {} \"{}\"", float.kind, float.id);

-                        // Don't want to send duped signals especially as configs get larger
-                        if !float_rules.contains(&float_rule) {
-                            float_rules.push(float_rule.clone());
+                    // Don't want to send duped signals especially as configs get larger
+                    if !float_rules.contains(&float_rule) {
+                        float_rules.push(float_rule.clone());

-                            // if let Some(comment) = float.comment {
-                            //     lines.push(format!("# {comment}"));
-                            // };
+                        if let Some(comment) = float.comment {
+                            lines.push(format!("# {comment}"));
+                        };

-                            lines.push(float_rule);
-                        }
+                        lines.push(float_rule);
                    }
                }
            }
@@ -245,23 +230,21 @@ impl ApplicationConfigurationGenerator {
            }

            if let Some(float_identifiers) = app.float_identifiers {
-                for matching_rule in float_identifiers {
-                    if let MatchingRule::Simple(float) = matching_rule {
-                        let float_rule = format!(
-                            "RunWait('komorebic.exe float-rule {} \"{}\"', , \"Hide\")",
-                            float.kind, float.id
-                        );
+                for float in float_identifiers {
+                    let float_rule = format!(
+                        "RunWait('komorebic.exe float-rule {} \"{}\"', , \"Hide\")",
+                        float.kind, float.id
+                    );

-                        // Don't want to send duped signals especially as configs get larger
-                        if !float_rules.contains(&float_rule) {
-                            float_rules.push(float_rule.clone());
+                    // Don't want to send duped signals especially as configs get larger
+                    if !float_rules.contains(&float_rule) {
+                        float_rules.push(float_rule.clone());

-                            // if let Some(comment) = float.comment {
-                            //     lines.push(format!("; {comment}"));
-                            // };
+                        if let Some(comment) = float.comment {
+                            lines.push(format!("; {comment}"));
+                        };

-                            lines.push(float_rule);
-                        }
+                        lines.push(float_rule);
                    }
                }
            }
--- a/komorebi-core/src/lib.rs
+++ b/komorebi-core/src/lib.rs
@@ -223,8 +223,6 @@ pub enum ApplicationIdentifier {
    Class,
    #[serde(alias = "title")]
    Title,
-    #[serde(alias = "path")]
-    Path,
 }

 #[derive(
--- a/komorebi-core/src/rect.rs
+++ b/komorebi-core/src/rect.rs
@@ -26,29 +26,13 @@ impl From<RECT> for Rect {
    }
 }

-impl From<Rect> for RECT {
-    fn from(rect: Rect) -> Self {
-        Self {
-            left: rect.left,
-            top: rect.top,
-            right: rect.right,
-            bottom: rect.bottom,
-        }
-    }
-}
-
 impl Rect {
    /// decrease the size of self by the padding amount.
-    pub fn add_padding<T>(&mut self, padding: T)
-    where
-        T: Into<Option<i32>>,
-    {
-        if let Some(padding) = padding.into() {
-            self.left += padding;
-            self.top += padding;
-            self.right -= padding * 2;
-            self.bottom -= padding * 2;
-        }
+    pub fn add_padding(&mut self, padding: i32) {
+        self.left += padding;
+        self.top += padding;
+        self.right -= padding * 2;
+        self.bottom -= padding * 2;
    }

    /// increase the size of self by the margin amount.
@@ -59,14 +43,6 @@ impl Rect {
        self.bottom += margin * 2;
    }

-    pub fn left_padding(&mut self, padding: i32) {
-        self.left += padding;
-    }
-
-    pub fn right_padding(&mut self, padding: i32) {
-        self.right -= padding;
-    }
-
    #[must_use]
    pub const fn contains_point(&self, point: (i32, i32)) -> bool {
        point.0 >= self.left
--- a/komorebi.example.json
+++ b/komorebi.example.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.20/schema.json",
+  "app_specific_configuration_path": "$Env:USERPROFILE/applications.yaml",
+  "window_hiding_behaviour": "Cloak",
+  "cross_monitor_move_behaviour": "Insert",
+  "default_workspace_padding": 20,
+  "default_container_padding": 20,
+  "active_window_border": false,
+  "active_window_border_colours": {
+    "single": { "r": 66, "g": 165, "b": 245 },
+    "stack": { "r": 256, "g": 165, "b": 66 },
+    "monocle": { "r": 255, "g": 51, "b": 153 }
+  },
+  "monitors": [
+    {
+      "workspaces": [
+        { "name": "I", "layout": "BSP" },
+        { "name": "II", "layout": "VerticalStack" },
+        { "name": "III", "layout": "HorizontalStack" },
+        { "name": "IV", "layout": "UltrawideVerticalStack" },
+        { "name": "V", "layout": "Rows" }
+      ]
+    }
+  ]
+}
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.23"
+version = "0.1.22-dev.0"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
@@ -22,18 +22,18 @@ ctrlc = "3"
 dirs = { workspace = true }
 getset = "0.1"
 hex_color = { version = "3", features = ["serde"] }
-hotwatch = "0.5"
+hotwatch = "0.4"
 lazy_static = "1"
 miow = "0.5"
 nanoid = "0.4"
 net2 = "0.2"
-os_info = "3.8"
+os_info = "3.7"
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }
 paste = "1"
 regex = "1"
 schemars = "0.8"
 serde = { version = "1", features = ["derive"] }
-serde_json = { workspace = true }
+serde_json = "1"
 strum = { version = "0.26", features = ["derive"] }
 sysinfo = "0.30"
 tracing = "0.1"
--- a/komorebi/src/com/mod.rs
+++ b/komorebi/src/com/mod.rs
@@ -10,6 +10,7 @@ use interfaces::IServiceProvider;

 use std::ffi::c_void;

+use windows::core::ComInterface;
 use windows::core::Interface;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::System::Com::CoCreateInstance;
--- a/komorebi/src/container.rs
+++ b/komorebi/src/container.rs
@@ -7,18 +7,13 @@ use serde::Deserialize;
 use serde::Serialize;

 use crate::ring::Ring;
-use crate::stackbar::Stackbar;
 use crate::window::Window;
-use crate::StackbarMode;
-use crate::STACKBAR_MODE;

 #[derive(Debug, Clone, Serialize, Deserialize, Getters, JsonSchema)]
 pub struct Container {
    #[getset(get = "pub")]
    id: String,
    windows: Ring<Window>,
-    #[getset(get = "pub", get_mut = "pub")]
-    stackbar: Option<Stackbar>,
 }

 impl_ring_elements!(Container, Window);
@@ -28,10 +23,6 @@ impl Default for Container {
        Self {
            id: nanoid!(),
            windows: Ring::default(),
-            stackbar: match *STACKBAR_MODE.lock() {
-                StackbarMode::Always => Stackbar::create().ok(),
-                StackbarMode::Never | StackbarMode::OnStack => None,
-            },
        }
    }
 }
@@ -43,38 +34,6 @@ impl PartialEq for Container {
 }

 impl Container {
-    pub fn hide(&self, omit: Option<isize>) {
-        if let Some(stackbar) = self.stackbar() {
-            stackbar.hide();
-        }
-
-        for window in self.windows().iter().rev() {
-            let mut should_hide = omit.is_none();
-
-            if !should_hide {
-                if let Some(omit) = omit {
-                    if omit != window.hwnd {
-                        should_hide = true
-                    }
-                }
-            }
-
-            if should_hide {
-                window.hide();
-            }
-        }
-    }
-
-    pub fn restore(&self) {
-        if let Some(stackbar) = self.stackbar() {
-            stackbar.restore();
-        }
-
-        if let Some(window) = self.focused_window() {
-            window.restore();
-        }
-    }
-
    pub fn load_focused_window(&mut self) {
        let focused_idx = self.focused_window_idx();
        for (i, window) in self.windows_mut().iter_mut().enumerate() {
@@ -122,10 +81,6 @@ impl Container {
    pub fn remove_window_by_idx(&mut self, idx: usize) -> Option<Window> {
        let window = self.windows_mut().remove(idx);

-        if matches!(*STACKBAR_MODE.lock(), StackbarMode::OnStack) && self.windows().len() <= 1 {
-            self.stackbar = None;
-        }
-
        if idx != 0 {
            self.focus_window(idx - 1);
        };
@@ -140,14 +95,6 @@ impl Container {

    pub fn add_window(&mut self, window: Window) {
        self.windows_mut().push_back(window);
-
-        if matches!(*STACKBAR_MODE.lock(), StackbarMode::OnStack)
-            && self.windows().len() > 1
-            && self.stackbar.is_none()
-        {
-            self.stackbar = Stackbar::create().ok();
-        }
-
        self.focus_window(self.windows().len() - 1);
    }

--- a/komorebi/src/lib.rs
+++ b/komorebi/src/lib.rs
@@ -10,7 +10,6 @@ pub mod process_command;
 pub mod process_event;
 pub mod process_movement;
 pub mod set_window_position;
-pub mod stackbar;
 pub mod static_config;
 pub mod styles;
 pub mod window;
@@ -24,7 +23,6 @@ pub mod workspace;

 use lazy_static::lazy_static;
 use std::collections::HashMap;
-use std::collections::VecDeque;
 use std::fs::File;
 use std::io::Write;
 use std::net::TcpStream;
@@ -40,7 +38,6 @@ use std::sync::Arc;
 pub use hidden::*;
 pub use process_command::*;
 pub use process_event::*;
-pub use stackbar::*;
 pub use static_config::*;
 pub use window_manager::*;
 pub use window_manager_event::*;
@@ -49,7 +46,6 @@ pub use windows_api::*;

 use color_eyre::Result;
 use komorebi_core::config_generation::IdWithIdentifier;
-use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::HidingBehaviour;
@@ -70,57 +66,57 @@ type WorkspaceRule = (usize, usize, bool);

 lazy_static! {
    static ref HIDDEN_HWNDS: Arc<Mutex<Vec<isize>>> = Arc::new(Mutex::new(vec![]));
-    static ref LAYERED_WHITELIST: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(vec![
-        MatchingRule::Simple(IdWithIdentifier {
+    static ref LAYERED_WHITELIST: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
+        IdWithIdentifier {
            kind: ApplicationIdentifier::Exe,
            id: String::from("steam.exe"),
            matching_strategy: Option::from(MatchingStrategy::Equals),
-        }),
+        },
    ]));
-    static ref TRAY_AND_MULTI_WINDOW_IDENTIFIERS: Arc<Mutex<Vec<MatchingRule>>> =
+    static ref TRAY_AND_MULTI_WINDOW_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> =
        Arc::new(Mutex::new(vec![
-            MatchingRule::Simple(IdWithIdentifier {
+            IdWithIdentifier {
                kind: ApplicationIdentifier::Exe,
                id: String::from("explorer.exe"),
                matching_strategy: Option::from(MatchingStrategy::Equals),
-            }),
-            MatchingRule::Simple(IdWithIdentifier {
+            },
+            IdWithIdentifier {
                kind: ApplicationIdentifier::Exe,
                id: String::from("firefox.exe"),
                matching_strategy: Option::from(MatchingStrategy::Equals),
-            }),
-            MatchingRule::Simple(IdWithIdentifier {
+            },
+            IdWithIdentifier {
                kind: ApplicationIdentifier::Exe,
                id: String::from("chrome.exe"),
                matching_strategy: Option::from(MatchingStrategy::Equals),
-            }),
-            MatchingRule::Simple(IdWithIdentifier {
+            },
+            IdWithIdentifier {
                kind: ApplicationIdentifier::Exe,
                id: String::from("idea64.exe"),
                matching_strategy: Option::from(MatchingStrategy::Equals),
-            }),
-            MatchingRule::Simple(IdWithIdentifier {
+            },
+            IdWithIdentifier {
                kind: ApplicationIdentifier::Exe,
                id: String::from("ApplicationFrameHost.exe"),
                matching_strategy: Option::from(MatchingStrategy::Equals),
-            }),
-            MatchingRule::Simple(IdWithIdentifier {
+            },
+            IdWithIdentifier {
                kind: ApplicationIdentifier::Exe,
                id: String::from("steam.exe"),
                matching_strategy: Option::from(MatchingStrategy::Equals),
-            })
+            }
        ]));
-    static ref OBJECT_NAME_CHANGE_ON_LAUNCH: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(vec![
-        MatchingRule::Simple(IdWithIdentifier {
+    static ref OBJECT_NAME_CHANGE_ON_LAUNCH: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
+        IdWithIdentifier {
            kind: ApplicationIdentifier::Exe,
            id: String::from("firefox.exe"),
            matching_strategy: Option::from(MatchingStrategy::Equals),
-        }),
-        MatchingRule::Simple(IdWithIdentifier {
+        },
+        IdWithIdentifier {
            kind: ApplicationIdentifier::Exe,
            id: String::from("idea64.exe"),
            matching_strategy: Option::from(MatchingStrategy::Equals),
-        }),
+        },
    ]));
    static ref MONITOR_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, Rect>>> =
        Arc::new(Mutex::new(HashMap::new()));
@@ -130,25 +126,25 @@ lazy_static! {
        Arc::new(Mutex::new(HashMap::new()));
    static ref REGEX_IDENTIFIERS: Arc<Mutex<HashMap<String, Regex>>> =
        Arc::new(Mutex::new(HashMap::new()));
-    static ref MANAGE_IDENTIFIERS: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(vec![]));
-    static ref FLOAT_IDENTIFIERS: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(vec![
+    static ref MANAGE_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![]));
+    static ref FLOAT_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![
        // mstsc.exe creates these on Windows 11 when a WSL process is launched
        // https://github.com/LGUG2Z/komorebi/issues/74
-        MatchingRule::Simple(IdWithIdentifier {
+        IdWithIdentifier {
            kind: ApplicationIdentifier::Class,
            id: String::from("OPContainerClass"),
            matching_strategy: Option::from(MatchingStrategy::Equals),
-        }),
-        MatchingRule::Simple(IdWithIdentifier {
+        },
+        IdWithIdentifier {
            kind: ApplicationIdentifier::Class,
            id: String::from("IHWindowClass"),
            matching_strategy: Option::from(MatchingStrategy::Equals),
-        })
+        }
    ]));
-
    static ref PERMAIGNORE_CLASSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
        "Chrome_RenderWidgetHostHWND".to_string(),
    ]));
+    static ref BORDER_OVERFLOW_IDENTIFIERS: Arc<Mutex<Vec<IdWithIdentifier>>> = Arc::new(Mutex::new(vec![]));
    static ref WSL2_UI_PROCESSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
        "X410.exe".to_string(),
        "vcxsrv.exe".to_string(),
@@ -193,21 +189,14 @@ lazy_static! {
        )
    };

-    static ref ACTIVE_WINDOW_BORDER_STYLE: Arc<Mutex<ActiveWindowBorderStyle>> =
-        Arc::new(Mutex::new(ActiveWindowBorderStyle::System));
-
    static ref BORDER_RECT: Arc<Mutex<Rect>> =
        Arc::new(Mutex::new(Rect::default()));

+    static ref BORDER_OFFSET: AtomicI32 = Default::default();

    // Use app-specific titlebar removal options where possible
    // eg. Windows Terminal, IntelliJ IDEA, Firefox
    static ref NO_TITLEBAR: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
-
-    static ref STACKBAR_MODE: Arc<Mutex<StackbarMode >> = Arc::new(Mutex::new(StackbarMode::Never));
-    static ref WINDOWS_BY_BAR_HWNDS: Arc<Mutex<HashMap<isize, VecDeque<isize>>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-
 }

 pub static DEFAULT_WORKSPACE_PADDING: AtomicI32 = AtomicI32::new(10);
@@ -223,21 +212,13 @@ pub static BORDER_COLOUR_SINGLE: AtomicU32 = AtomicU32::new(0);
 pub static BORDER_COLOUR_STACK: AtomicU32 = AtomicU32::new(0);
 pub static BORDER_COLOUR_MONOCLE: AtomicU32 = AtomicU32::new(0);
 pub static BORDER_COLOUR_CURRENT: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(8);
-pub static BORDER_OFFSET: AtomicI32 = AtomicI32::new(-1);
-
+pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(20);
 // 0 0 0 aka pure black, I doubt anyone will want this as a border colour
 pub const TRANSPARENCY_COLOUR: u32 = 0;
 pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);

 pub static HIDDEN_HWND: AtomicIsize = AtomicIsize::new(0);

-pub static STACKBAR_FOCUSED_TEXT_COLOUR: AtomicU32 = AtomicU32::new(16777215); // white
-pub static STACKBAR_UNFOCUSED_TEXT_COLOUR: AtomicU32 = AtomicU32::new(11776947); // gray text
-pub static STACKBAR_TAB_BACKGROUND_COLOUR: AtomicU32 = AtomicU32::new(3355443); // gray
-pub static STACKBAR_TAB_HEIGHT: AtomicI32 = AtomicI32::new(40);
-pub static STACKBAR_TAB_WIDTH: AtomicI32 = AtomicI32::new(200);
-
 #[must_use]
 pub fn current_virtual_desktop() -> Option<Vec<u8>> {
    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
--- a/komorebi/src/main.rs
+++ b/komorebi/src/main.rs
@@ -34,7 +34,6 @@ use komorebi::window_manager::WindowManager;
 use komorebi::windows_api::WindowsApi;
 use komorebi::winevent_listener;
 use komorebi::CUSTOM_FFM;
-use komorebi::DATA_DIR;
 use komorebi::HOME_DIR;
 use komorebi::INITIAL_CONFIGURATION_LOADED;
 use komorebi::SESSION_ID;
@@ -200,8 +199,6 @@ fn main() -> Result<()> {
        Option::from,
    );

-    std::fs::create_dir_all(&*DATA_DIR)?;
-
    let wm = if let Some(config) = &static_config {
        tracing::info!(
            "creating window manager from static configuration file: {}",
--- a/komorebi/src/monitor.rs
+++ b/komorebi/src/monitor.rs
@@ -71,7 +71,7 @@ impl Monitor {
            if i == focused_idx {
                workspace.restore(mouse_follows_focus)?;
            } else {
-                workspace.hide(None);
+                workspace.hide();
            }
        }

--- a/komorebi/src/process_command.rs
+++ b/komorebi/src/process_command.rs
@@ -23,7 +23,6 @@ use uds_windows::UnixStream;

 use komorebi_core::config_generation::ApplicationConfiguration;
 use komorebi_core::config_generation::IdWithIdentifier;
-use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::Axis;
@@ -57,6 +56,7 @@ use crate::BORDER_ENABLED;
 use crate::BORDER_HIDDEN;
 use crate::BORDER_HWND;
 use crate::BORDER_OFFSET;
+use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::BORDER_WIDTH;
 use crate::CUSTOM_FFM;
 use crate::DATA_DIR;
@@ -216,7 +216,6 @@ impl WindowManager {
            SocketMessage::UnstackWindow => self.remove_window_from_container()?,
            SocketMessage::CycleStack(direction) => {
                self.cycle_container_window_in_direction(direction)?;
-                self.focused_window()?.focus(self.mouse_follows_focus)?;
            }
            SocketMessage::ForceFocus => {
                let focused_window = self.focused_window()?;
@@ -274,19 +273,17 @@ impl WindowManager {

                let mut should_push = true;
                for m in &*manage_identifiers {
-                    if let MatchingRule::Simple(m) = m {
-                        if m.id.eq(id) {
-                            should_push = false;
-                        }
+                    if m.id.eq(id) {
+                        should_push = false;
                    }
                }

                if should_push {
-                    manage_identifiers.push(MatchingRule::Simple(IdWithIdentifier {
+                    manage_identifiers.push(IdWithIdentifier {
                        kind: identifier,
                        id: id.clone(),
                        matching_strategy: Option::from(MatchingStrategy::Legacy),
-                    }));
+                    });
                }
            }
            SocketMessage::FloatRule(identifier, ref id) => {
@@ -294,19 +291,17 @@ impl WindowManager {

                let mut should_push = true;
                for f in &*float_identifiers {
-                    if let MatchingRule::Simple(f) = f {
-                        if f.id.eq(id) {
-                            should_push = false;
-                        }
+                    if f.id.eq(id) {
+                        should_push = false;
                    }
                }

                if should_push {
-                    float_identifiers.push(MatchingRule::Simple(IdWithIdentifier {
+                    float_identifiers.push(IdWithIdentifier {
                        kind: identifier,
                        id: id.clone(),
                        matching_strategy: Option::from(MatchingStrategy::Legacy),
-                    }));
+                    });
                }

                let offset = self.work_area_offset;
@@ -320,11 +315,6 @@ impl WindowManager {
                    {
                        for window in container.windows() {
                            match identifier {
-                                ApplicationIdentifier::Path => {
-                                    if window.path()? == *id {
-                                        hwnds_to_purge.push((i, window.hwnd));
-                                    }
-                                }
                                ApplicationIdentifier::Exe => {
                                    if window.exe()? == *id {
                                        hwnds_to_purge.push((i, window.hwnd));
@@ -1025,43 +1015,57 @@ impl WindowManager {
            SocketMessage::WatchConfiguration(enable) => {
                self.watch_configuration(enable)?;
            }
+            SocketMessage::IdentifyBorderOverflowApplication(identifier, ref id) => {
+                let mut identifiers = BORDER_OVERFLOW_IDENTIFIERS.lock();
+
+                let mut should_push = true;
+                for i in &*identifiers {
+                    if i.id.eq(id) {
+                        should_push = false;
+                    }
+                }
+
+                if should_push {
+                    identifiers.push(IdWithIdentifier {
+                        kind: identifier,
+                        id: id.clone(),
+                        matching_strategy: Option::from(MatchingStrategy::Legacy),
+                    });
+                }
+            }
            SocketMessage::IdentifyObjectNameChangeApplication(identifier, ref id) => {
                let mut identifiers = OBJECT_NAME_CHANGE_ON_LAUNCH.lock();

                let mut should_push = true;
                for i in &*identifiers {
-                    if let MatchingRule::Simple(i) = i {
-                        if i.id.eq(id) {
-                            should_push = false;
-                        }
+                    if i.id.eq(id) {
+                        should_push = false;
                    }
                }

                if should_push {
-                    identifiers.push(MatchingRule::Simple(IdWithIdentifier {
+                    identifiers.push(IdWithIdentifier {
                        kind: identifier,
                        id: id.clone(),
                        matching_strategy: Option::from(MatchingStrategy::Legacy),
-                    }));
+                    });
                }
            }
            SocketMessage::IdentifyTrayApplication(identifier, ref id) => {
                let mut identifiers = TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock();
                let mut should_push = true;
                for i in &*identifiers {
-                    if let MatchingRule::Simple(i) = i {
-                        if i.id.eq(id) {
-                            should_push = false;
-                        }
+                    if i.id.eq(id) {
+                        should_push = false;
                    }
                }

                if should_push {
-                    identifiers.push(MatchingRule::Simple(IdWithIdentifier {
+                    identifiers.push(IdWithIdentifier {
                        kind: identifier,
                        id: id.clone(),
                        matching_strategy: Option::from(MatchingStrategy::Legacy),
-                    }));
+                    });
                }
            }
            SocketMessage::IdentifyLayeredApplication(identifier, ref id) => {
@@ -1069,19 +1073,17 @@ impl WindowManager {

                let mut should_push = true;
                for i in &*identifiers {
-                    if let MatchingRule::Simple(i) = i {
-                        if i.id.eq(id) {
-                            should_push = false;
-                        }
+                    if i.id.eq(id) {
+                        should_push = false;
                    }
                }

                if should_push {
-                    identifiers.push(MatchingRule::Simple(IdWithIdentifier {
+                    identifiers.push(IdWithIdentifier {
                        kind: identifier,
                        id: id.clone(),
                        matching_strategy: Option::from(MatchingStrategy::Legacy),
-                    }));
+                    });
                }
            }
            SocketMessage::ManageFocusedWindow => {
@@ -1249,6 +1251,9 @@ impl WindowManager {
                BORDER_OFFSET.store(offset, Ordering::SeqCst);
                WindowsApi::invalidate_border_rect()?;
            }
+            SocketMessage::AltFocusHack(_) => {
+                tracing::info!("this action is deprecated");
+            }
            SocketMessage::ApplicationSpecificConfigurationSchema => {
                let asc = schema_for!(Vec<ApplicationConfiguration>);
                let schema = serde_json::to_string_pretty(&asc)?;
@@ -1296,9 +1301,6 @@ impl WindowManager {
                REMOVE_TITLEBARS.store(!current, Ordering::SeqCst);
                self.update_focused_workspace(false)?;
            }
-            // Deprecated commands
-            SocketMessage::AltFocusHack(_)
-            | SocketMessage::IdentifyBorderOverflowApplication(_, _) => {}
        };

        match message {
@@ -1382,14 +1384,10 @@ impl WindowManager {
                    );
                }

-                // it is not acceptable to fail here; we need to be able to send the event to
-                // subscribers
-                if self.focused_container().is_ok() {
-                    let stack = BORDER_COLOUR_STACK.load(Ordering::SeqCst);
-                    if stack != 0 && self.focused_container()?.windows().len() > 1 {
-                        BORDER_COLOUR_CURRENT
-                            .store(stack, Ordering::SeqCst);
-                    }
+                let stack = BORDER_COLOUR_STACK.load(Ordering::SeqCst);
+                if stack != 0 && self.focused_container()?.windows().len() > 1 {
+                    BORDER_COLOUR_CURRENT
+                        .store(stack, Ordering::SeqCst);
                }

                let border = Border::from(BORDER_HWND.load(Ordering::SeqCst));
--- a/komorebi/src/process_event.rs
+++ b/komorebi/src/process_event.rs
@@ -28,8 +28,6 @@ use crate::BORDER_COLOUR_STACK;
 use crate::BORDER_ENABLED;
 use crate::BORDER_HIDDEN;
 use crate::BORDER_HWND;
-use crate::BORDER_OFFSET;
-use crate::BORDER_WIDTH;
 use crate::DATA_DIR;
 use crate::HIDDEN_HWNDS;
 use crate::REGEX_IDENTIFIERS;
@@ -147,7 +145,7 @@ impl WindowManager {

        match event {
            WindowManagerEvent::Raise(window) => {
-                window.focus(false)?;
+                window.raise();
                self.has_pending_raise_op = false;
            }
            WindowManagerEvent::Destroy(_, window) | WindowManagerEvent::Unmanage(window) => {
@@ -187,7 +185,6 @@ impl WindowManager {
                    let title = &window.title()?;
                    let exe_name = &window.exe()?;
                    let class = &window.class()?;
-                    let path = &window.path()?;

                    // We don't want to purge windows that have been deliberately hidden by us, eg. when
                    // they are not on the top of a container stack.
@@ -196,7 +193,6 @@ impl WindowManager {
                        title,
                        exe_name,
                        class,
-                        path,
                        &tray_and_multi_window_identifiers,
                        &regex_identifiers,
                    );
@@ -339,8 +335,11 @@ impl WindowManager {
                let new_window_behaviour = self.window_container_behaviour;

                let workspace = self.focused_workspace_mut()?;
-
-                if workspace.contains_managed_window(window.hwnd) {
+                if !workspace
+                    .floating_windows()
+                    .iter()
+                    .any(|w| w.hwnd == window.hwnd)
+                {
                    let focused_container_idx = workspace.focused_container_idx();

                    let new_position = WindowsApi::window_rect(window.hwnd())?;
@@ -377,14 +376,7 @@ impl WindowManager {

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

                    if is_move {
                        tracing::info!("moving with mouse");
@@ -476,17 +468,17 @@ impl WindowManager {
                        let mut ops = vec![];

                        macro_rules! resize_op {
-                            ($coordinate:expr, $comparator:tt, $direction:expr) => {{
-                                let adjusted = $coordinate * 2;
-                                let sizing = if adjusted $comparator 0 {
-                                    Sizing::Decrease
-                                } else {
-                                    Sizing::Increase
-                                };
+                        ($coordinate:expr, $comparator:tt, $direction:expr) => {{
+                            let adjusted = $coordinate * 2;
+                            let sizing = if adjusted $comparator 0 {
+                                Sizing::Decrease
+                            } else {
+                                Sizing::Increase
+                            };

-                                ($direction, sizing, adjusted.abs())
-                            }};
-                        }
+                            ($direction, sizing, adjusted.abs())
+                        }};
+                    }

                        if resize.left != 0 {
                            ops.push(resize_op!(resize.left, >, OperationDirection::Left));
@@ -496,14 +488,11 @@ impl WindowManager {
                            ops.push(resize_op!(resize.top, >, OperationDirection::Up));
                        }

-                        let top_left_constant = BORDER_WIDTH.load(Ordering::SeqCst)
-                            + BORDER_OFFSET.load(Ordering::SeqCst);
-
-                        if resize.right != 0 && resize.left == top_left_constant {
+                        if resize.right != 0 && resize.left == 0 {
                            ops.push(resize_op!(resize.right, <, OperationDirection::Right));
                        }

-                        if resize.bottom != 0 && resize.top == top_left_constant {
+                        if resize.bottom != 0 && resize.top == 0 {
                            ops.push(resize_op!(resize.bottom, <, OperationDirection::Down));
                        }

@@ -515,9 +504,6 @@ impl WindowManager {
                    }
                }
            }
-            WindowManagerEvent::ForceUpdate(_) => {
-                self.update_focused_workspace(false)?;
-            }
            WindowManagerEvent::DisplayChange(..)
            | WindowManagerEvent::MouseCapture(..)
            | WindowManagerEvent::Cloak(..)
--- a/komorebi/src/stackbar.rs
+++ b/komorebi/src/stackbar.rs
@@ -1,294 +0,0 @@
-use std::collections::VecDeque;
-use std::sync::atomic::Ordering;
-use std::time::Duration;
-
-use color_eyre::eyre::Result;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use windows::core::PCWSTR;
-use windows::Win32::Foundation::COLORREF;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::Foundation::LPARAM;
-use windows::Win32::Foundation::LRESULT;
-use windows::Win32::Foundation::WPARAM;
-use windows::Win32::Graphics::Gdi::CreateFontIndirectW;
-use windows::Win32::Graphics::Gdi::CreatePen;
-use windows::Win32::Graphics::Gdi::CreateSolidBrush;
-use windows::Win32::Graphics::Gdi::DrawTextW;
-use windows::Win32::Graphics::Gdi::GetDC;
-use windows::Win32::Graphics::Gdi::ReleaseDC;
-use windows::Win32::Graphics::Gdi::SelectObject;
-use windows::Win32::Graphics::Gdi::SetBkColor;
-use windows::Win32::Graphics::Gdi::SetTextColor;
-use windows::Win32::Graphics::Gdi::DT_CENTER;
-use windows::Win32::Graphics::Gdi::DT_END_ELLIPSIS;
-use windows::Win32::Graphics::Gdi::DT_SINGLELINE;
-use windows::Win32::Graphics::Gdi::DT_VCENTER;
-use windows::Win32::Graphics::Gdi::FONT_QUALITY;
-use windows::Win32::Graphics::Gdi::FW_BOLD;
-use windows::Win32::Graphics::Gdi::LOGFONTW;
-use windows::Win32::Graphics::Gdi::PROOF_QUALITY;
-use windows::Win32::Graphics::Gdi::PS_SOLID;
-use windows::Win32::UI::WindowsAndMessaging::CreateWindowExW;
-use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
-use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
-use windows::Win32::UI::WindowsAndMessaging::GetMessageW;
-use windows::Win32::UI::WindowsAndMessaging::PostQuitMessage;
-use windows::Win32::UI::WindowsAndMessaging::RegisterClassW;
-use windows::Win32::UI::WindowsAndMessaging::SetLayeredWindowAttributes;
-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::LWA_COLORKEY;
-use windows::Win32::UI::WindowsAndMessaging::MSG;
-use windows::Win32::UI::WindowsAndMessaging::SW_SHOW;
-use windows::Win32::UI::WindowsAndMessaging::WM_DESTROY;
-use windows::Win32::UI::WindowsAndMessaging::WM_LBUTTONDOWN;
-use windows::Win32::UI::WindowsAndMessaging::WNDCLASSW;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_LAYERED;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOOLWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_POPUP;
-use windows::Win32::UI::WindowsAndMessaging::WS_VISIBLE;
-
-use komorebi_core::Rect;
-
-use crate::window::Window;
-use crate::windows_api::WindowsApi;
-use crate::winevent::WinEvent;
-use crate::winevent_listener;
-use crate::WindowManagerEvent;
-use crate::DEFAULT_CONTAINER_PADDING;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
-use crate::TRANSPARENCY_COLOUR;
-use crate::WINDOWS_BY_BAR_HWNDS;
-
-#[derive(Debug, Default, Serialize, Deserialize, JsonSchema)]
-pub struct Stackbar {
-    pub(crate) hwnd: isize,
-    #[serde(skip)]
-    pub is_cloned: bool,
-}
-
-impl Drop for Stackbar {
-    fn drop(&mut self) {
-        if !self.is_cloned {
-            let _ = WindowsApi::close_window(self.hwnd());
-        }
-    }
-}
-
-impl Clone for Stackbar {
-    fn clone(&self) -> Self {
-        Self {
-            hwnd: self.hwnd,
-            is_cloned: true,
-        }
-    }
-}
-impl Stackbar {
-    unsafe extern "system" fn window_proc(
-        hwnd: HWND,
-        msg: u32,
-        w_param: WPARAM,
-        l_param: LPARAM,
-    ) -> LRESULT {
-        match msg {
-            WM_LBUTTONDOWN => {
-                let win_hwnds_by_topbar = WINDOWS_BY_BAR_HWNDS.lock();
-                if let Some(win_hwnds) = win_hwnds_by_topbar.get(&hwnd.0) {
-                    let x = l_param.0 as i32 & 0xFFFF;
-                    let y = (l_param.0 as i32 >> 16) & 0xFFFF;
-
-                    let width = STACKBAR_TAB_WIDTH.load(Ordering::SeqCst);
-                    let height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
-                    let gap = DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst);
-
-                    for (index, win_hwnd) in win_hwnds.iter().enumerate() {
-                        let left = gap + (index as i32 * (width + gap));
-                        let right = left + width;
-                        let top = 0;
-                        let bottom = height;
-
-                        if x >= left && x <= right && y >= top && y <= bottom {
-                            let window = Window { hwnd: *win_hwnd };
-                            let event_sender = winevent_listener::event_tx();
-                            let _ = event_sender.send(WindowManagerEvent::FocusChange(
-                                WinEvent::ObjectFocus,
-                                window,
-                            ));
-                            let _ = event_sender.send(WindowManagerEvent::ForceUpdate(window));
-                        }
-                    }
-                }
-
-                WINDOWS_BY_BAR_HWNDS.force_unlock();
-                LRESULT(0)
-            }
-            WM_DESTROY => {
-                PostQuitMessage(0);
-                LRESULT(0)
-            }
-            _ => DefWindowProcW(hwnd, msg, w_param, l_param),
-        }
-    }
-
-    pub const fn hwnd(&self) -> HWND {
-        HWND(self.hwnd)
-    }
-
-    pub fn create() -> Result<Stackbar> {
-        let name: Vec<u16> = "komorebi_stackbar\0".encode_utf16().collect();
-        let class_name = PCWSTR(name.as_ptr());
-
-        let h_module = WindowsApi::module_handle_w()?;
-
-        let wnd_class = WNDCLASSW {
-            style: CS_HREDRAW | CS_VREDRAW,
-            lpfnWndProc: Some(Self::window_proc),
-            hInstance: h_module.into(),
-            lpszClassName: class_name,
-            hbrBackground: WindowsApi::create_solid_brush(TRANSPARENCY_COLOUR),
-            ..Default::default()
-        };
-
-        unsafe {
-            RegisterClassW(&wnd_class);
-        }
-
-        let (hwnd_sender, hwnd_receiver) = crossbeam_channel::bounded::<HWND>(1);
-
-        let name_cl = name.clone();
-        std::thread::spawn(move || -> Result<()> {
-            unsafe {
-                let hwnd = CreateWindowExW(
-                    WS_EX_TOOLWINDOW | WS_EX_LAYERED,
-                    PCWSTR(name_cl.as_ptr()),
-                    PCWSTR(name_cl.as_ptr()),
-                    WS_POPUP | WS_VISIBLE,
-                    0,
-                    0,
-                    0,
-                    0,
-                    None,
-                    None,
-                    h_module,
-                    None,
-                );
-
-                SetLayeredWindowAttributes(hwnd, COLORREF(TRANSPARENCY_COLOUR), 0, LWA_COLORKEY)?;
-                hwnd_sender.send(hwnd)?;
-
-                let mut msg = MSG::default();
-                while GetMessageW(&mut msg, hwnd, 0, 0).into() {
-                    TranslateMessage(&msg);
-                    DispatchMessageW(&msg);
-                    std::thread::sleep(Duration::from_millis(10));
-                }
-            }
-
-            Ok(())
-        });
-
-        Ok(Self {
-            hwnd: hwnd_receiver.recv()?.0,
-            ..Default::default()
-        })
-    }
-
-    pub fn set_position(&self, layout: &Rect, top: bool) -> Result<()> {
-        WindowsApi::position_window(self.hwnd(), layout, top)
-    }
-
-    pub fn get_position_from_container_layout(&self, layout: &Rect) -> Rect {
-        Rect {
-            bottom: STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst),
-            ..*layout
-        }
-    }
-
-    pub fn update(&self, windows: &VecDeque<Window>, focused_hwnd: isize) -> Result<()> {
-        let width = STACKBAR_TAB_WIDTH.load(Ordering::SeqCst);
-        let height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
-        let gap = DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst);
-        let background = STACKBAR_TAB_BACKGROUND_COLOUR.load(Ordering::SeqCst);
-        let focused_text_colour = STACKBAR_FOCUSED_TEXT_COLOUR.load(Ordering::SeqCst);
-        let unfocused_text_colour = STACKBAR_UNFOCUSED_TEXT_COLOUR.load(Ordering::SeqCst);
-
-        unsafe {
-            let hdc = GetDC(self.hwnd());
-
-            let hpen = CreatePen(PS_SOLID, 0, COLORREF(background));
-            let hbrush = CreateSolidBrush(COLORREF(background));
-
-            SelectObject(hdc, hpen);
-            SelectObject(hdc, hbrush);
-            SetBkColor(hdc, COLORREF(background));
-
-            let hfont = CreateFontIndirectW(&LOGFONTW {
-                lfWeight: FW_BOLD.0 as i32,
-                lfQuality: FONT_QUALITY(PROOF_QUALITY.0),
-                ..Default::default()
-            });
-
-            SelectObject(hdc, hfont);
-
-            for (i, window) in windows.iter().enumerate() {
-                if window.hwnd == focused_hwnd {
-                    SetTextColor(hdc, COLORREF(focused_text_colour));
-
-                    window.focus(false)?;
-                } else {
-                    SetTextColor(hdc, COLORREF(unfocused_text_colour));
-                }
-
-                let left = gap + (i as i32 * (width + gap));
-                let mut tab_box = Rect {
-                    top: 0,
-                    left,
-                    right: left + width,
-                    bottom: height,
-                };
-
-                WindowsApi::round_rect(hdc, &tab_box, 8);
-
-                let exe = window.exe()?;
-                let exe_trimmed = exe.trim_end_matches(".exe");
-                let mut tab_title: Vec<u16> = exe_trimmed.encode_utf16().collect();
-
-                tab_box.left_padding(10);
-                tab_box.right_padding(10);
-
-                DrawTextW(
-                    hdc,
-                    &mut tab_title,
-                    &mut tab_box.into(),
-                    DT_SINGLELINE | DT_CENTER | DT_VCENTER | DT_END_ELLIPSIS,
-                );
-            }
-
-            ReleaseDC(self.hwnd(), hdc);
-        }
-
-        let mut windows_hwdns: VecDeque<isize> = VecDeque::new();
-        for window in windows {
-            windows_hwdns.push_back(window.hwnd);
-        }
-
-        WINDOWS_BY_BAR_HWNDS.lock().insert(self.hwnd, windows_hwdns);
-
-        Ok(())
-    }
-
-    pub fn hide(&self) {
-        WindowsApi::hide_window(self.hwnd())
-    }
-
-    pub fn restore(&self) {
-        WindowsApi::show_window(self.hwnd(), SW_SHOW)
-    }
-}
--- a/komorebi/src/static_config.rs
+++ b/komorebi/src/static_config.rs
@@ -7,7 +7,6 @@ use crate::window_manager::WindowManager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::workspace::Workspace;
-use crate::ACTIVE_WINDOW_BORDER_STYLE;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_COLOUR_MONOCLE;
 use crate::BORDER_COLOUR_SINGLE;
@@ -15,6 +14,7 @@ use crate::BORDER_COLOUR_STACK;
 use crate::BORDER_ENABLED;
 use crate::BORDER_HWND;
 use crate::BORDER_OFFSET;
+use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::BORDER_WIDTH;
 use crate::DATA_DIR;
 use crate::DEFAULT_CONTAINER_PADDING;
@@ -27,24 +27,16 @@ use crate::MANAGE_IDENTIFIERS;
 use crate::MONITOR_INDEX_PREFERENCES;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REGEX_IDENTIFIERS;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_MODE;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;

 use color_eyre::Result;
 use crossbeam_channel::Receiver;
-use hotwatch::EventKind;
+use hotwatch::notify::DebouncedEvent;
 use hotwatch::Hotwatch;
-use komorebi_core::config_generation::ApplicationConfiguration;
 use komorebi_core::config_generation::ApplicationConfigurationGenerator;
 use komorebi_core::config_generation::ApplicationOptions;
 use komorebi_core::config_generation::IdWithIdentifier;
-use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
 use komorebi_core::resolve_home_path;
 use komorebi_core::ApplicationIdentifier;
@@ -82,17 +74,6 @@ pub struct ActiveWindowBorderColours {
    pub monocle: Colour,
 }

-#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub enum ActiveWindowBorderStyle {
-    #[default]
-    /// Use the system border style
-    System,
-    /// Use the Windows 11-style rounded borders
-    Rounded,
-    /// Use the Windows 10-style square borders
-    Square,
-}
-
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct WorkspaceConfig {
    /// Name
@@ -271,9 +252,6 @@ pub struct StaticConfig {
    /// Active window border colours for different container types
    #[serde(skip_serializing_if = "Option::is_none")]
    pub active_window_border_colours: Option<ActiveWindowBorderColours>,
-    /// Active window border style (default: System)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub active_window_border_style: Option<ActiveWindowBorderStyle>,
    /// Global default workspace padding (default: 10)
    #[serde(skip_serializing_if = "Option::is_none")]
    pub default_workspace_padding: Option<i32>,
@@ -291,52 +269,28 @@ pub struct StaticConfig {
    pub global_work_area_offset: Option<Rect>,
    /// Individual window floating rules
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub float_rules: Option<Vec<MatchingRule>>,
+    pub float_rules: Option<Vec<IdWithIdentifier>>,
    /// Individual window force-manage rules
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub manage_rules: Option<Vec<MatchingRule>>,
+    pub manage_rules: Option<Vec<IdWithIdentifier>>,
    /// Identify border overflow applications
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub border_overflow_applications: Option<Vec<MatchingRule>>,
+    pub border_overflow_applications: Option<Vec<IdWithIdentifier>>,
    /// Identify tray and multi-window applications
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tray_and_multi_window_applications: Option<Vec<MatchingRule>>,
+    pub tray_and_multi_window_applications: Option<Vec<IdWithIdentifier>>,
    /// Identify applications that have the WS_EX_LAYERED extended window style
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layered_applications: Option<Vec<MatchingRule>>,
+    pub layered_applications: Option<Vec<IdWithIdentifier>>,
    /// Identify applications that send EVENT_OBJECT_NAMECHANGE on launch (very rare)
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub object_name_change_applications: Option<Vec<MatchingRule>>,
+    pub object_name_change_applications: Option<Vec<IdWithIdentifier>>,
    /// Set monitor index preferences
    #[serde(skip_serializing_if = "Option::is_none")]
    pub monitor_index_preferences: Option<HashMap<usize, Rect>>,
    /// Set display index preferences
    #[serde(skip_serializing_if = "Option::is_none")]
    pub display_index_preferences: Option<HashMap<usize, String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stackbar: Option<StackbarConfig>,
-}
-
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
-pub enum StackbarMode {
-    Always,
-    Never,
-    OnStack,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct TabsConfig {
-    width: Option<i32>,
-    focused_text: Option<Colour>,
-    unfocused_text: Option<Colour>,
-    background: Option<Colour>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct StackbarConfig {
-    height: Option<i32>,
-    mode: Option<StackbarMode>,
-    tabs: Option<TabsConfig>,
 }

 impl From<&WindowManager> for StaticConfig {
@@ -425,7 +379,6 @@ impl From<&WindowManager> for StaticConfig {
            border_offset: Option::from(BORDER_OFFSET.load(Ordering::SeqCst)),
            active_window_border: Option::from(BORDER_ENABLED.load(Ordering::SeqCst)),
            active_window_border_colours: border_colours,
-            active_window_border_style: Option::from(*ACTIVE_WINDOW_BORDER_STYLE.lock()),
            default_workspace_padding: Option::from(
                DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst),
            ),
@@ -443,7 +396,6 @@ impl From<&WindowManager> for StaticConfig {
            object_name_change_applications: None,
            monitor_index_preferences: Option::from(MONITOR_INDEX_PREFERENCES.lock().clone()),
            display_index_preferences: Option::from(DISPLAY_INDEX_PREFERENCES.lock().clone()),
-            stackbar: None,
        }
    }
 }
@@ -492,67 +444,112 @@ impl StaticConfig {
            BORDER_COLOUR_MONOCLE.store(u32::from(colours.monocle), Ordering::SeqCst);
        }

-        let active_window_border_style = self.active_window_border_style.unwrap_or_default();
-        *ACTIVE_WINDOW_BORDER_STYLE.lock() = active_window_border_style;
-
        let mut float_identifiers = FLOAT_IDENTIFIERS.lock();
        let mut regex_identifiers = REGEX_IDENTIFIERS.lock();
        let mut manage_identifiers = MANAGE_IDENTIFIERS.lock();
        let mut tray_and_multi_window_identifiers = TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock();
+        let mut border_overflow_identifiers = BORDER_OVERFLOW_IDENTIFIERS.lock();
        let mut object_name_change_identifiers = OBJECT_NAME_CHANGE_ON_LAUNCH.lock();
        let mut layered_identifiers = LAYERED_WHITELIST.lock();

-        if let Some(rules) = &mut self.float_rules {
-            populate_rules(rules, &mut float_identifiers, &mut regex_identifiers)?;
-        }
+        if let Some(float) = &mut self.float_rules {
+            for identifier in float {
+                if identifier.matching_strategy.is_none() {
+                    identifier.matching_strategy = Option::from(MatchingStrategy::Legacy);
+                }

-        if let Some(rules) = &mut self.manage_rules {
-            populate_rules(rules, &mut manage_identifiers, &mut regex_identifiers)?;
-        }
+                if !float_identifiers.contains(identifier) {
+                    float_identifiers.push(identifier.clone());

-        if let Some(rules) = &mut self.object_name_change_applications {
-            populate_rules(
-                rules,
-                &mut object_name_change_identifiers,
-                &mut regex_identifiers,
-            )?;
-        }
-
-        if let Some(rules) = &mut self.layered_applications {
-            populate_rules(rules, &mut layered_identifiers, &mut regex_identifiers)?;
-        }
-
-        if let Some(rules) = &mut self.tray_and_multi_window_applications {
-            populate_rules(
-                rules,
-                &mut tray_and_multi_window_identifiers,
-                &mut regex_identifiers,
-            )?;
-        }
-
-        if let Some(stackbar) = &self.stackbar {
-            if let Some(height) = &stackbar.height {
-                STACKBAR_TAB_HEIGHT.store(*height, Ordering::SeqCst);
+                    if matches!(identifier.matching_strategy, Some(MatchingStrategy::Regex)) {
+                        let re = Regex::new(&identifier.id)?;
+                        regex_identifiers.insert(identifier.id.clone(), re);
+                    }
+                }
            }
-            if let Some(mode) = &stackbar.mode {
-                let mut stackbar_mode = STACKBAR_MODE.lock();
-                *stackbar_mode = *mode;
+        }
+
+        if let Some(manage) = &mut self.manage_rules {
+            for identifier in manage {
+                if identifier.matching_strategy.is_none() {
+                    identifier.matching_strategy = Option::from(MatchingStrategy::Legacy);
+                }
+
+                if !manage_identifiers.contains(identifier) {
+                    manage_identifiers.push(identifier.clone());
+
+                    if matches!(identifier.matching_strategy, Some(MatchingStrategy::Regex)) {
+                        let re = Regex::new(&identifier.id)?;
+                        regex_identifiers.insert(identifier.id.clone(), re);
+                    }
+                }
            }
-            if let Some(tabs) = &stackbar.tabs {
-                if let Some(background) = &tabs.background {
-                    STACKBAR_TAB_BACKGROUND_COLOUR.store((*background).into(), Ordering::SeqCst);
+        }
+
+        if let Some(identifiers) = &mut self.object_name_change_applications {
+            for identifier in identifiers {
+                if identifier.matching_strategy.is_none() {
+                    identifier.matching_strategy = Option::from(MatchingStrategy::Legacy);
                }

-                if let Some(colour) = &tabs.focused_text {
-                    STACKBAR_FOCUSED_TEXT_COLOUR.store((*colour).into(), Ordering::SeqCst);
+                if !object_name_change_identifiers.contains(identifier) {
+                    object_name_change_identifiers.push(identifier.clone());
+
+                    if matches!(identifier.matching_strategy, Some(MatchingStrategy::Regex)) {
+                        let re = Regex::new(&identifier.id)?;
+                        regex_identifiers.insert(identifier.id.clone(), re);
+                    }
+                }
+            }
+        }
+
+        if let Some(identifiers) = &mut self.layered_applications {
+            for identifier in identifiers {
+                if identifier.matching_strategy.is_none() {
+                    identifier.matching_strategy = Option::from(MatchingStrategy::Legacy);
                }

-                if let Some(colour) = &tabs.unfocused_text {
-                    STACKBAR_UNFOCUSED_TEXT_COLOUR.store((*colour).into(), Ordering::SeqCst);
+                if !layered_identifiers.contains(identifier) {
+                    layered_identifiers.push(identifier.clone());
+
+                    if matches!(identifier.matching_strategy, Some(MatchingStrategy::Regex)) {
+                        let re = Regex::new(&identifier.id)?;
+                        regex_identifiers.insert(identifier.id.clone(), re);
+                    }
+                }
+            }
+        }
+
+        if let Some(identifiers) = &mut self.border_overflow_applications {
+            for identifier in identifiers {
+                if identifier.matching_strategy.is_none() {
+                    identifier.matching_strategy = Option::from(MatchingStrategy::Legacy);
                }

-                if let Some(width) = &tabs.width {
-                    STACKBAR_TAB_WIDTH.store(*width, Ordering::SeqCst);
+                if !border_overflow_identifiers.contains(identifier) {
+                    border_overflow_identifiers.push(identifier.clone());
+
+                    if matches!(identifier.matching_strategy, Some(MatchingStrategy::Regex)) {
+                        let re = Regex::new(&identifier.id)?;
+                        regex_identifiers.insert(identifier.id.clone(), re);
+                    }
+                }
+            }
+        }
+
+        if let Some(identifiers) = &mut self.tray_and_multi_window_applications {
+            for identifier in identifiers {
+                if identifier.matching_strategy.is_none() {
+                    identifier.matching_strategy = Option::from(MatchingStrategy::Legacy);
+                }
+
+                if !tray_and_multi_window_identifiers.contains(identifier) {
+                    tray_and_multi_window_identifiers.push(identifier.clone());
+
+                    if matches!(identifier.matching_strategy, Some(MatchingStrategy::Regex)) {
+                        let re = Regex::new(&identifier.id)?;
+                        regex_identifiers.insert(identifier.id.clone(), re);
+                    }
                }
            }
        }
@@ -563,43 +560,121 @@ impl StaticConfig {
            let asc = ApplicationConfigurationGenerator::load(&content)?;

            for mut entry in asc {
-                if let Some(rules) = &mut entry.float_identifiers {
-                    populate_rules(rules, &mut float_identifiers, &mut regex_identifiers)?;
-                }
+                if let Some(float) = entry.float_identifiers {
+                    for f in float {
+                        let mut without_comment: IdWithIdentifier = f.into();
+                        if without_comment.matching_strategy.is_none() {
+                            without_comment.matching_strategy =
+                                Option::from(MatchingStrategy::Legacy);
+                        }

-                if let Some(ref options) = entry.options {
-                    let options = options.clone();
+                        if !float_identifiers.contains(&without_comment) {
+                            float_identifiers.push(without_comment.clone());
+
+                            if matches!(
+                                without_comment.matching_strategy,
+                                Some(MatchingStrategy::Regex)
+                            ) {
+                                let re = Regex::new(&without_comment.id)?;
+                                regex_identifiers.insert(without_comment.id.clone(), re);
+                            }
+                        }
+                    }
+                }
+                if let Some(options) = entry.options {
                    for o in options {
                        match o {
                            ApplicationOptions::ObjectNameChange => {
-                                populate_option(
-                                    &mut entry,
-                                    &mut object_name_change_identifiers,
-                                    &mut regex_identifiers,
-                                )?;
+                                if entry.identifier.matching_strategy.is_none() {
+                                    entry.identifier.matching_strategy =
+                                        Option::from(MatchingStrategy::Legacy);
+                                }
+
+                                if !object_name_change_identifiers.contains(&entry.identifier) {
+                                    object_name_change_identifiers.push(entry.identifier.clone());
+
+                                    if matches!(
+                                        entry.identifier.matching_strategy,
+                                        Some(MatchingStrategy::Regex)
+                                    ) {
+                                        let re = Regex::new(&entry.identifier.id)?;
+                                        regex_identifiers.insert(entry.identifier.id.clone(), re);
+                                    }
+                                }
                            }
                            ApplicationOptions::Layered => {
-                                populate_option(
-                                    &mut entry,
-                                    &mut layered_identifiers,
-                                    &mut regex_identifiers,
-                                )?;
+                                if entry.identifier.matching_strategy.is_none() {
+                                    entry.identifier.matching_strategy =
+                                        Option::from(MatchingStrategy::Legacy);
+                                }
+
+                                if !layered_identifiers.contains(&entry.identifier) {
+                                    layered_identifiers.push(entry.identifier.clone());
+
+                                    if matches!(
+                                        entry.identifier.matching_strategy,
+                                        Some(MatchingStrategy::Regex)
+                                    ) {
+                                        let re = Regex::new(&entry.identifier.id)?;
+                                        regex_identifiers.insert(entry.identifier.id.clone(), re);
+                                    }
+                                }
+                            }
+                            ApplicationOptions::BorderOverflow => {
+                                if entry.identifier.matching_strategy.is_none() {
+                                    entry.identifier.matching_strategy =
+                                        Option::from(MatchingStrategy::Legacy);
+                                }
+
+                                if !border_overflow_identifiers.contains(&entry.identifier) {
+                                    border_overflow_identifiers.push(entry.identifier.clone());
+
+                                    if matches!(
+                                        entry.identifier.matching_strategy,
+                                        Some(MatchingStrategy::Regex)
+                                    ) {
+                                        let re = Regex::new(&entry.identifier.id)?;
+                                        regex_identifiers.insert(entry.identifier.id.clone(), re);
+                                    }
+                                }
                            }
                            ApplicationOptions::TrayAndMultiWindow => {
-                                populate_option(
-                                    &mut entry,
-                                    &mut tray_and_multi_window_identifiers,
-                                    &mut regex_identifiers,
-                                )?;
+                                if entry.identifier.matching_strategy.is_none() {
+                                    entry.identifier.matching_strategy =
+                                        Option::from(MatchingStrategy::Legacy);
+                                }
+
+                                if !tray_and_multi_window_identifiers.contains(&entry.identifier) {
+                                    tray_and_multi_window_identifiers
+                                        .push(entry.identifier.clone());
+
+                                    if matches!(
+                                        entry.identifier.matching_strategy,
+                                        Some(MatchingStrategy::Regex)
+                                    ) {
+                                        let re = Regex::new(&entry.identifier.id)?;
+                                        regex_identifiers.insert(entry.identifier.id.clone(), re);
+                                    }
+                                }
                            }
                            ApplicationOptions::Force => {
-                                populate_option(
-                                    &mut entry,
-                                    &mut manage_identifiers,
-                                    &mut regex_identifiers,
-                                )?;
+                                if entry.identifier.matching_strategy.is_none() {
+                                    entry.identifier.matching_strategy =
+                                        Option::from(MatchingStrategy::Legacy);
+                                }
+
+                                if !manage_identifiers.contains(&entry.identifier) {
+                                    manage_identifiers.push(entry.identifier.clone());
+
+                                    if matches!(
+                                        entry.identifier.matching_strategy,
+                                        Some(MatchingStrategy::Regex)
+                                    ) {
+                                        let re = Regex::new(&entry.identifier.id)?;
+                                        regex_identifiers.insert(entry.identifier.id.clone(), re);
+                                    }
+                                }
                            }
-                            ApplicationOptions::BorderOverflow => {} // deprecated
                        }
                    }
                }
@@ -669,10 +744,10 @@ impl StaticConfig {

        let bytes = SocketMessage::ReloadStaticConfiguration(path.clone()).as_bytes()?;

-        wm.hotwatch.watch(path, move |event| match event.kind {
+        wm.hotwatch.watch(path, move |event| match event {
            // Editing in Notepad sends a NoticeWrite while editing in (Neo)Vim sends
            // a NoticeRemove, presumably because of the use of swap files?
-            EventKind::Modify(_) | EventKind::Remove(_) => {
+            DebouncedEvent::NoticeWrite(_) | DebouncedEvent::NoticeRemove(_) => {
                let socket = DATA_DIR.join("komorebi.sock");
                let mut stream =
                    UnixStream::connect(socket).expect("could not connect to komorebi.sock");
@@ -826,67 +901,3 @@ impl StaticConfig {
        Ok(())
    }
 }
-
-fn populate_option(
-    entry: &mut ApplicationConfiguration,
-    identifiers: &mut Vec<MatchingRule>,
-    regex_identifiers: &mut HashMap<String, Regex>,
-) -> Result<()> {
-    if entry.identifier.matching_strategy.is_none() {
-        entry.identifier.matching_strategy = Option::from(MatchingStrategy::Legacy);
-    }
-
-    let rule = MatchingRule::Simple(entry.identifier.clone());
-
-    if !identifiers.contains(&rule) {
-        identifiers.push(rule);
-
-        if matches!(
-            entry.identifier.matching_strategy,
-            Some(MatchingStrategy::Regex)
-        ) {
-            let re = Regex::new(&entry.identifier.id)?;
-            regex_identifiers.insert(entry.identifier.id.clone(), re);
-        }
-    }
-
-    Ok(())
-}
-
-fn populate_rules(
-    matching_rules: &mut Vec<MatchingRule>,
-    identifiers: &mut Vec<MatchingRule>,
-    regex_identifiers: &mut HashMap<String, Regex>,
-) -> Result<()> {
-    for matching_rule in matching_rules {
-        if !identifiers.contains(matching_rule) {
-            match matching_rule {
-                MatchingRule::Simple(simple) => {
-                    if simple.matching_strategy.is_none() {
-                        simple.matching_strategy = Option::from(MatchingStrategy::Legacy);
-                    }
-
-                    if matches!(simple.matching_strategy, Some(MatchingStrategy::Regex)) {
-                        let re = Regex::new(&simple.id)?;
-                        regex_identifiers.insert(simple.id.clone(), re);
-                    }
-                }
-                MatchingRule::Composite(composite) => {
-                    for rule in composite {
-                        if rule.matching_strategy.is_none() {
-                            rule.matching_strategy = Option::from(MatchingStrategy::Legacy);
-                        }
-
-                        if matches!(rule.matching_strategy, Some(MatchingStrategy::Regex)) {
-                            let re = Regex::new(&rule.id)?;
-                            regex_identifiers.insert(rule.id.clone(), re);
-                        }
-                    }
-                }
-            }
-            identifiers.push(matching_rule.clone());
-        }
-    }
-
-    Ok(())
-}
--- a/komorebi/src/window.rs
+++ b/komorebi/src/window.rs
@@ -4,13 +4,11 @@ use std::convert::TryFrom;
 use std::fmt::Display;
 use std::fmt::Formatter;
 use std::fmt::Write as _;
-use std::time::Duration;

 use color_eyre::eyre;
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
 use komorebi_core::config_generation::IdWithIdentifier;
-use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
 use regex::Regex;
 use schemars::JsonSchema;
@@ -217,6 +215,57 @@ impl Window {
        WindowsApi::unmaximize_window(self.hwnd());
    }

+    pub fn raise(self) {
+        // Attach komorebi thread to Window thread
+        let (_, window_thread_id) = WindowsApi::window_thread_process_id(self.hwnd());
+        let current_thread_id = WindowsApi::current_thread_id();
+
+        // This can be allowed to fail if a window doesn't have a message queue or if a journal record
+        // hook has been installed
+        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-attachthreadinput#remarks
+        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, true) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not attach to window thread input processing mechanism, but continuing execution of raise(): {}",
+                    error
+                );
+            }
+        };
+
+        // Raise Window to foreground
+        match WindowsApi::set_foreground_window(self.hwnd()) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not set as foreground window, but continuing execution of raise(): {}",
+                    error
+                );
+            }
+        };
+
+        // This isn't really needed when the above command works as expected via AHK
+        match WindowsApi::set_focus(self.hwnd()) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not set focus, but continuing execution of raise(): {}",
+                    error
+                );
+            }
+        };
+
+        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, false) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not detach from window thread input processing mechanism, but continuing execution of raise(): {}",
+                    error
+                );
+            }
+        };
+    }
+
    pub fn focus(self, mouse_follows_focus: bool) -> Result<()> {
        // Attach komorebi thread to Window thread
        let (_, window_thread_id) = WindowsApi::window_thread_process_id(self.hwnd());
@@ -328,14 +377,6 @@ impl Window {
        WindowsApi::window_text_w(self.hwnd())
    }

-    pub fn path(self) -> Result<String> {
-        let (process_id, _) = WindowsApi::window_thread_process_id(self.hwnd());
-        let handle = WindowsApi::process_handle(process_id)?;
-        let path = WindowsApi::exe_path(handle);
-        WindowsApi::close_process(handle)?;
-        path
-    }
-
    pub fn exe(self) -> Result<String> {
        let (process_id, _) = WindowsApi::window_thread_process_id(self.hwnd());
        let handle = WindowsApi::process_handle(process_id)?;
@@ -399,8 +440,8 @@ impl Window {
            (true, _) |
            // If not allowing cloaked windows, we need to ensure the window is not cloaked
            (false, false) => {
-                if let (Ok(title), Ok(exe_name), Ok(class), Ok(path)) = (self.title(), self.exe(), self.class(), self.path()) {
-                    return Ok(window_is_eligible(&title, &exe_name, &class, &path, &self.style()?, &self.ex_style()?, event));
+                if let (Ok(title), Ok(exe_name), Ok(class)) = (self.title(), self.exe(), self.class()) {
+                    return Ok(window_is_eligible(&title, &exe_name, &class, &self.style()?, &self.ex_style()?, event));
                }
            }
            _ => {}
@@ -414,7 +455,6 @@ fn window_is_eligible(
    title: &String,
    exe_name: &String,
    class: &String,
-    path: &str,
    style: &WindowStyle,
    ex_style: &ExtendedWindowStyle,
    event: Option<WindowManagerEvent>,
@@ -433,7 +473,6 @@ fn window_is_eligible(
        title,
        exe_name,
        class,
-        path,
        &float_identifiers,
        &regex_identifiers,
    );
@@ -443,7 +482,6 @@ fn window_is_eligible(
        title,
        exe_name,
        class,
-        path,
        &manage_identifiers,
        &regex_identifiers,
    );
@@ -457,7 +495,6 @@ fn window_is_eligible(
        title,
        exe_name,
        class,
-        path,
        &layered_whitelist,
        &regex_identifiers,
    );
@@ -475,10 +512,6 @@ fn window_is_eligible(
        titlebars_removed.contains(exe_name)
    };

-    if exe_name.contains("firefox") {
-        std::thread::sleep(Duration::from_millis(10));
-    }
-
    if (allow_wsl2_gui || allow_titlebar_removed || style.contains(WindowStyle::CAPTION) && ex_style.contains(ExtendedWindowStyle::WINDOWEDGE))
                        && !ex_style.contains(ExtendedWindowStyle::DLGMODALFRAME)
                        // Get a lot of dupe events coming through that make the redrawing go crazy
@@ -489,13 +522,8 @@ fn window_is_eligible(
        || managed_override
    {
        return true;
-    } else if let Some(event) = event {
-        tracing::debug!(
-            "ignoring (exe: {}, title: {}, event: {})",
-            exe_name,
-            title,
-            event
-        );
+    } else if event.is_some() {
+        tracing::debug!("ignoring (exe: {}, title: {})", exe_name, title);
    }

    false
@@ -506,291 +534,125 @@ pub fn should_act(
    title: &str,
    exe_name: &str,
    class: &str,
-    path: &str,
-    identifiers: &[MatchingRule],
+    identifiers: &[IdWithIdentifier],
    regex_identifiers: &HashMap<String, Regex>,
 ) -> bool {
    let mut should_act = false;
    for identifier in identifiers {
-        match identifier {
-            MatchingRule::Simple(identifier) => {
-                if should_act_individual(
-                    title,
-                    exe_name,
-                    class,
-                    path,
-                    identifier,
-                    regex_identifiers,
-                ) {
-                    should_act = true
-                };
+        match identifier.matching_strategy {
+            None => {
+                panic!("there is no matching strategy identified for this rule");
            }
-            MatchingRule::Composite(identifiers) => {
-                let mut composite_results = vec![];
-                for identifier in identifiers {
-                    composite_results.push(should_act_individual(
-                        title,
-                        exe_name,
-                        class,
-                        path,
-                        identifier,
-                        regex_identifiers,
-                    ));
+            Some(MatchingStrategy::Legacy) => match identifier.kind {
+                ApplicationIdentifier::Title => {
+                    if title.starts_with(&identifier.id) || title.ends_with(&identifier.id) {
+                        should_act = true;
+                    }
                }
-
-                if composite_results.iter().all(|&x| x) {
-                    should_act = true;
+                ApplicationIdentifier::Class => {
+                    if class.starts_with(&identifier.id) || class.ends_with(&identifier.id) {
+                        should_act = true;
+                    }
                }
-            }
+                ApplicationIdentifier::Exe => {
+                    if exe_name.eq(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+            },
+            Some(MatchingStrategy::Equals) => match identifier.kind {
+                ApplicationIdentifier::Title => {
+                    if title.eq(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+                ApplicationIdentifier::Class => {
+                    if class.eq(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+                ApplicationIdentifier::Exe => {
+                    if exe_name.eq(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+            },
+            Some(MatchingStrategy::StartsWith) => match identifier.kind {
+                ApplicationIdentifier::Title => {
+                    if title.starts_with(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+                ApplicationIdentifier::Class => {
+                    if class.starts_with(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+                ApplicationIdentifier::Exe => {
+                    if exe_name.starts_with(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+            },
+            Some(MatchingStrategy::EndsWith) => match identifier.kind {
+                ApplicationIdentifier::Title => {
+                    if title.ends_with(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+                ApplicationIdentifier::Class => {
+                    if class.ends_with(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+                ApplicationIdentifier::Exe => {
+                    if exe_name.ends_with(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+            },
+            Some(MatchingStrategy::Contains) => match identifier.kind {
+                ApplicationIdentifier::Title => {
+                    if title.contains(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+                ApplicationIdentifier::Class => {
+                    if class.contains(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+                ApplicationIdentifier::Exe => {
+                    if exe_name.contains(&identifier.id) {
+                        should_act = true;
+                    }
+                }
+            },
+            Some(MatchingStrategy::Regex) => match identifier.kind {
+                ApplicationIdentifier::Title => {
+                    if let Some(re) = regex_identifiers.get(&identifier.id) {
+                        if re.is_match(title) {
+                            should_act = true;
+                        }
+                    }
+                }
+                ApplicationIdentifier::Class => {
+                    if let Some(re) = regex_identifiers.get(&identifier.id) {
+                        if re.is_match(class) {
+                            should_act = true;
+                        }
+                    }
+                }
+                ApplicationIdentifier::Exe => {
+                    if let Some(re) = regex_identifiers.get(&identifier.id) {
+                        if re.is_match(exe_name) {
+                            should_act = true;
+                        }
+                    }
+                }
+            },
        }
    }

    should_act
 }
-
-pub fn should_act_individual(
-    title: &str,
-    exe_name: &str,
-    class: &str,
-    path: &str,
-    identifier: &IdWithIdentifier,
-    regex_identifiers: &HashMap<String, Regex>,
-) -> bool {
-    let mut should_act = false;
-
-    match identifier.matching_strategy {
-        None => {
-            panic!("there is no matching strategy identified for this rule");
-        }
-        Some(MatchingStrategy::Legacy) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if title.starts_with(&identifier.id) || title.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if class.starts_with(&identifier.id) || class.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if exe_name.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if path.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::Equals) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if title.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if class.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if exe_name.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if path.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::DoesNotEqual) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if !title.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if !class.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if !exe_name.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if !path.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::StartsWith) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if title.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if class.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if exe_name.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if path.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::DoesNotStartWith) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if !title.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if !class.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if !exe_name.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if !path.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::EndsWith) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if title.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if class.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if exe_name.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if path.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::DoesNotEndWith) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if !title.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if !class.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if !exe_name.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if !path.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::Contains) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if title.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if class.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if exe_name.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if path.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::DoesNotContain) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if !title.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if !class.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if !exe_name.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if !path.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
-        Some(MatchingStrategy::Regex) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if let Some(re) = regex_identifiers.get(&identifier.id) {
-                    if re.is_match(title) {
-                        should_act = true;
-                    }
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if let Some(re) = regex_identifiers.get(&identifier.id) {
-                    if re.is_match(class) {
-                        should_act = true;
-                    }
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if let Some(re) = regex_identifiers.get(&identifier.id) {
-                    if re.is_match(exe_name) {
-                        should_act = true;
-                    }
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if let Some(re) = regex_identifiers.get(&identifier.id) {
-                    if re.is_match(path) {
-                        should_act = true;
-                    }
-                }
-            }
-        },
-    }
-
-    should_act
-}
--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -12,8 +12,7 @@ use color_eyre::eyre::anyhow;
 use color_eyre::eyre::bail;
 use color_eyre::Result;
 use crossbeam_channel::Receiver;
-use hotwatch::notify::ErrorKind as NotifyErrorKind;
-use hotwatch::EventKind;
+use hotwatch::notify::DebouncedEvent;
 use hotwatch::Hotwatch;
 use parking_lot::Mutex;
 use schemars::JsonSchema;
@@ -21,7 +20,7 @@ use serde::Deserialize;
 use serde::Serialize;
 use uds_windows::UnixListener;

-use komorebi_core::config_generation::MatchingRule;
+use komorebi_core::config_generation::IdWithIdentifier;
 use komorebi_core::custom_layout::CustomLayout;
 use komorebi_core::Arrangement;
 use komorebi_core::Axis;
@@ -49,6 +48,7 @@ use crate::windows_api::WindowsApi;
 use crate::winevent_listener;
 use crate::workspace::Workspace;
 use crate::BORDER_HWND;
+use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::DATA_DIR;
 use crate::DISPLAY_INDEX_PREFERENCES;
 use crate::FLOAT_IDENTIFIERS;
@@ -96,11 +96,12 @@ pub struct State {
    pub mouse_follows_focus: bool,
    pub has_pending_raise_op: bool,
    pub remove_titlebars: bool,
-    pub float_identifiers: Vec<MatchingRule>,
-    pub manage_identifiers: Vec<MatchingRule>,
-    pub layered_whitelist: Vec<MatchingRule>,
-    pub tray_and_multi_window_identifiers: Vec<MatchingRule>,
-    pub name_change_on_launch_identifiers: Vec<MatchingRule>,
+    pub float_identifiers: Vec<IdWithIdentifier>,
+    pub manage_identifiers: Vec<IdWithIdentifier>,
+    pub layered_whitelist: Vec<IdWithIdentifier>,
+    pub tray_and_multi_window_identifiers: Vec<IdWithIdentifier>,
+    pub border_overflow_identifiers: Vec<IdWithIdentifier>,
+    pub name_change_on_launch_identifiers: Vec<IdWithIdentifier>,
    pub monitor_index_preferences: HashMap<usize, Rect>,
    pub display_index_preferences: HashMap<usize, String>,
 }
@@ -128,6 +129,7 @@ impl From<&WindowManager> for State {
            manage_identifiers: MANAGE_IDENTIFIERS.lock().clone(),
            layered_whitelist: LAYERED_WHITELIST.lock().clone(),
            tray_and_multi_window_identifiers: TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock().clone(),
+            border_overflow_identifiers: BORDER_OVERFLOW_IDENTIFIERS.lock().clone(),
            name_change_on_launch_identifiers: OBJECT_NAME_CHANGE_ON_LAUNCH.lock().clone(),
            monitor_index_preferences: MONITOR_INDEX_PREFERENCES.lock().clone(),
            display_index_preferences: DISPLAY_INDEX_PREFERENCES.lock().clone(),
@@ -209,16 +211,12 @@ impl WindowManager {

    #[tracing::instrument(skip(self))]
    pub fn show_border(&self) -> Result<()> {
-        if self.focused_container().is_ok() {
-            let foreground = WindowsApi::foreground_window()?;
-            let foreground_window = Window { hwnd: foreground };
+        let foreground = WindowsApi::foreground_window()?;
+        let foreground_window = Window { hwnd: foreground };

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

    #[tracing::instrument(skip(self))]
@@ -263,18 +261,18 @@ impl WindowManager {
            match self.hotwatch.unwatch(&config) {
                Ok(()) => {}
                Err(error) => match error {
-                    hotwatch::Error::Notify(ref notify_error) => match notify_error.kind {
-                        NotifyErrorKind::WatchNotFound => {}
-                        _ => return Err(error.into()),
+                    hotwatch::Error::Notify(error) => match error {
+                        hotwatch::notify::Error::WatchNotFound => {}
+                        error => return Err(error.into()),
                    },
                    error @ hotwatch::Error::Io(_) => return Err(error.into()),
                },
            }

-            self.hotwatch.watch(config, |event| match event.kind {
+            self.hotwatch.watch(config, |event| match event {
                // Editing in Notepad sends a NoticeWrite while editing in (Neo)Vim sends
                // a NoticeRemove, presumably because of the use of swap files?
-                EventKind::Modify(_) | EventKind::Remove(_) => {
+                DebouncedEvent::NoticeWrite(_) | DebouncedEvent::NoticeRemove(_) => {
                    std::thread::spawn(|| {
                        load_configuration().expect("could not load configuration");
                    });
@@ -668,44 +666,63 @@ impl WindowManager {

    #[tracing::instrument(skip(self))]
    pub fn raise_window_at_cursor_pos(&mut self) -> Result<()> {
-        let mut hwnd = None;
+        let mut hwnd = WindowsApi::window_at_cursor_pos()?;

-        for monitor in self.monitors() {
-            for workspace in monitor.workspaces() {
-                if let Some(container_idx) = workspace.container_idx_from_current_point() {
-                    if let Some(container) = workspace.containers().get(container_idx) {
-                        if let Some(window) = container.focused_window() {
-                            hwnd = Some(window.hwnd);
+        if self.has_pending_raise_op
+            || self.focused_window()?.hwnd == hwnd
+            // Sometimes we need this check, because the focus may have been given by a click
+            // to a non-window such as the taskbar or system tray, and komorebi doesn't know that
+            // the focused window of the workspace is not actually focused by the OS at that point
+            || WindowsApi::foreground_window()? == hwnd
+        {
+            Ok(())
+        } else {
+            let mut known_hwnd = false;
+            for monitor in self.monitors() {
+                for workspace in monitor.workspaces() {
+                    if workspace.contains_window(hwnd) {
+                        known_hwnd = true;
+                    }
+                }
+            }
+
+            // TODO: Not sure if this needs to be made configurable just yet...
+            let overlay_classes = [
+                // Chromium/Electron
+                "Chrome_RenderWidgetHostHWND".to_string(),
+                // Explorer
+                "DirectUIHWND".to_string(),
+                "SysTreeView32".to_string(),
+                "ToolbarWindow32".to_string(),
+                "NetUIHWND".to_string(),
+            ];
+
+            if !known_hwnd {
+                let class = Window { hwnd }.class()?;
+                // Some applications (Electron/Chromium-based, explorer) have (invisible?) overlays
+                // windows that we need to look beyond to find the actual window to raise
+                if overlay_classes.contains(&class) {
+                    for monitor in self.monitors() {
+                        for workspace in monitor.workspaces() {
+                            if let Some(exe_hwnd) = workspace.hwnd_from_exe(&Window { hwnd }.exe()?)
+                            {
+                                hwnd = exe_hwnd;
+                                known_hwnd = true;
+                            }
                        }
                    }
                }
            }
-        }

-        if let Some(hwnd) = hwnd {
-            if self.has_pending_raise_op
-                    || self.focused_window()?.hwnd == hwnd
-                    // Sometimes we need this check, because the focus may have been given by a click
-                    // to a non-window such as the taskbar or system tray, and komorebi doesn't know that
-                    // the focused window of the workspace is not actually focused by the OS at that point
-                    || WindowsApi::foreground_window()? == hwnd
-            {
-                return Ok(());
+            if known_hwnd {
+                let event = WindowManagerEvent::Raise(Window { hwnd });
+                self.has_pending_raise_op = true;
+                Ok(winevent_listener::event_tx().send(event)?)
+            } else {
+                tracing::debug!("not raising unknown window: {}", Window { hwnd });
+                Ok(())
            }
-
-            let event = WindowManagerEvent::Raise(Window { hwnd });
-            self.has_pending_raise_op = true;
-            winevent_listener::event_tx().send(event)?;
-        } else {
-            tracing::debug!(
-                "not raising unknown window: {}",
-                Window {
-                    hwnd: WindowsApi::window_at_cursor_pos()?
-                }
-            );
        }
-
-        Ok(())
    }

    #[tracing::instrument(skip(self))]
@@ -834,20 +851,19 @@ impl WindowManager {
            }
        }

-        // if we passed false for follow_focus and there is a container on the workspace
-        if !follow_focus && self.focused_container_mut().is_ok() {
+        // if we passed false for follow_focus
+        if !follow_focus
            // and we have a stack with >1 windows
-            if self.focused_container_mut()?.windows().len() > 1
-                // and we don't have a maxed window 
-                && self.focused_workspace()?.maximized_window().is_none()
-                // and we don't have a monocle container
-                && self.focused_workspace()?.monocle_container().is_none()
-            {
-                if let Ok(window) = self.focused_window_mut() {
-                    window.focus(self.mouse_follows_focus)?;
-                }
+            && self.focused_container_mut()?.windows().len() > 1
+            // and we don't have a maxed window 
+            && self.focused_workspace()?.maximized_window().is_none()
+            // and we don't have a monocle container
+            && self.focused_workspace()?.monocle_container().is_none()
+        {
+            if let Ok(window) = self.focused_window_mut() {
+                window.focus(self.mouse_follows_focus)?;
            }
-        }
+        };

        // This is to correctly restore and focus when switching to a workspace which
        // contains a managed maximized window
@@ -1194,21 +1210,7 @@ impl WindowManager {
            }
        }

-        // When switching workspaces and landing focus on a window that is not stack, but a stack
-        // exists, and there is a stackbar visible, when changing focus to that container stack,
-        // the focused text colour will not be applied until the stack has been cycled at least once
-        //
-        // With this piece of code, we check if we have changed focus to a container stack with
-        // a stackbar, and if we have, we run a quick update to make sure the focused text colour
-        // has been applied
-        let focused_window = self.focused_window_mut()?;
-        let focused_window_hwnd = focused_window.hwnd;
-        focused_window.focus(self.mouse_follows_focus)?;
-
-        let focused_container = self.focused_container()?;
-        if let Some(stackbar) = focused_container.stackbar() {
-            stackbar.update(focused_container.windows(), focused_window_hwnd)?;
-        }
+        self.focused_window_mut()?.focus(self.mouse_follows_focus)?;

        Ok(())
    }
@@ -1447,9 +1449,7 @@ impl WindowManager {
                anyhow!("this is not a valid direction from the current position")
            })?;

-            let adjusted_new_index = if new_idx > current_container_idx
-                && !matches!(workspace.layout(), Layout::Default(DefaultLayout::Grid))
-            {
+            let adjusted_new_index = if new_idx > current_container_idx {
                new_idx - 1
            } else {
                new_idx
--- a/komorebi/src/window_manager_event.rs
+++ b/komorebi/src/window_manager_event.rs
@@ -28,7 +28,6 @@ pub enum WindowManagerEvent {
    Unmanage(Window),
    Raise(Window),
    DisplayChange(Window),
-    ForceUpdate(Window),
 }

 impl Display for WindowManagerEvent {
@@ -79,9 +78,6 @@ impl Display for WindowManagerEvent {
            Self::DisplayChange(window) => {
                write!(f, "DisplayChange (Window: {window})")
            }
-            Self::ForceUpdate(window) => {
-                write!(f, "ForceUpdate (Window: {window})")
-            }
        }
    }
 }
@@ -102,8 +98,7 @@ impl WindowManagerEvent {
            | Self::Raise(window)
            | Self::Manage(window)
            | Self::DisplayChange(window)
-            | Self::Unmanage(window)
-            | Self::ForceUpdate(window) => window,
+            | Self::Unmanage(window) => window,
        }
    }

@@ -144,13 +139,11 @@ impl WindowManagerEvent {
                let title = &window.title().ok()?;
                let exe_name = &window.exe().ok()?;
                let class = &window.class().ok()?;
-                let path = &window.path().ok()?;

                let should_trigger = should_act(
                    title,
                    exe_name,
                    class,
-                    path,
                    &object_name_change_on_launch,
                    &regex_identifiers,
                );
--- a/komorebi/src/windows_api.rs
+++ b/komorebi/src/windows_api.rs
@@ -36,8 +36,6 @@ use windows::Win32::Graphics::Gdi::GetMonitorInfoW;
 use windows::Win32::Graphics::Gdi::InvalidateRect;
 use windows::Win32::Graphics::Gdi::MonitorFromPoint;
 use windows::Win32::Graphics::Gdi::MonitorFromWindow;
-use windows::Win32::Graphics::Gdi::Rectangle;
-use windows::Win32::Graphics::Gdi::RoundRect;
 use windows::Win32::Graphics::Gdi::DISPLAY_DEVICEW;
 use windows::Win32::Graphics::Gdi::HBRUSH;
 use windows::Win32::Graphics::Gdi::HDC;
@@ -68,7 +66,6 @@ use windows::Win32::UI::Input::KeyboardAndMouse::INPUT_MOUSE;
 use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEEVENTF_LEFTDOWN;
 use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEEVENTF_LEFTUP;
 use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEINPUT;
-use windows::Win32::UI::Input::KeyboardAndMouse::VK_LBUTTON;
 use windows::Win32::UI::Input::KeyboardAndMouse::VK_MENU;
 use windows::Win32::UI::WindowsAndMessaging::AllowSetForegroundWindow;
 use windows::Win32::UI::WindowsAndMessaging::BringWindowToTop;
@@ -360,7 +357,7 @@ impl WindowsApi {
            bottom: layout.bottom + shadow_rect.bottom,
        };

-        let position = if top { HWND_TOP } else { HWND_NOTOPMOST };
+        let position = if top { HWND_TOP } else { HWND_BOTTOM };
        Self::set_window_pos(hwnd, &rect, position, flags.bits())
    }

@@ -421,7 +418,7 @@ impl WindowsApi {
        .process()
    }

-    pub fn show_window(hwnd: HWND, command: SHOW_WINDOW_CMD) {
+    fn show_window(hwnd: HWND, command: SHOW_WINDOW_CMD) {
        // BOOL is returned but does not signify whether or not the operation was succesful
        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-showwindow
        unsafe { ShowWindow(hwnd, command) };
@@ -530,24 +527,6 @@ impl WindowsApi {
        })
    }

-    pub fn round_rect(hdc: HDC, rect: &Rect, border_radius: i32) {
-        unsafe {
-            RoundRect(
-                hdc,
-                rect.left,
-                rect.top,
-                rect.right,
-                rect.bottom,
-                border_radius,
-                border_radius,
-            );
-        }
-    }
-    pub fn rectangle(hdc: HDC, rect: &Rect) {
-        unsafe {
-            Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom);
-        }
-    }
    fn set_cursor_pos(x: i32, y: i32) -> Result<()> {
        unsafe { SetCursorPos(x, y) }.process()
    }
@@ -985,13 +964,6 @@ impl WindowsApi {
        actual != 0
    }

-    pub fn lbutton_is_pressed() -> bool {
-        let state = unsafe { GetKeyState(i32::from(VK_LBUTTON.0)) };
-        #[allow(clippy::cast_sign_loss)]
-        let actual = (state as u16) & 0x8000;
-        actual != 0
-    }
-
    pub fn left_click() -> u32 {
        let inputs = [
            INPUT {
--- a/komorebi/src/windows_callbacks.rs
+++ b/komorebi/src/windows_callbacks.rs
@@ -41,8 +41,6 @@ use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::winevent::WinEvent;
 use crate::winevent_listener;
-use crate::ActiveWindowBorderStyle;
-use crate::ACTIVE_WINDOW_BORDER_STYLE;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_RECT;
 use crate::BORDER_WIDTH;
@@ -234,20 +232,10 @@ pub extern "system" fn border_window(
                // the window was made with DWMWCP_ROUNDSMALL then this is the
                // wrong size.  In the future we should read the DWM properties
                // of windows and attempt to match appropriately.
-                match *ACTIVE_WINDOW_BORDER_STYLE.lock() {
-                    ActiveWindowBorderStyle::System => {
-                        if *WINDOWS_11 {
-                            RoundRect(hdc, 0, 0, border_rect.right, border_rect.bottom, 20, 20);
-                        } else {
-                            Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
-                        }
-                    }
-                    ActiveWindowBorderStyle::Rounded => {
-                        RoundRect(hdc, 0, 0, border_rect.right, border_rect.bottom, 20, 20);
-                    }
-                    ActiveWindowBorderStyle::Square => {
-                        Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
-                    }
+                if *WINDOWS_11 {
+                    RoundRect(hdc, 0, 0, border_rect.right, border_rect.bottom, 20, 20);
+                } else {
+                    Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
                }
                EndPaint(window, &ps);
                ValidateRect(window, None);
--- a/komorebi/src/workspace.rs
+++ b/komorebi/src/workspace.rs
@@ -33,7 +33,6 @@ use crate::DEFAULT_WORKSPACE_PADDING;
 use crate::INITIAL_CONFIGURATION_LOADED;
 use crate::NO_TITLEBAR;
 use crate::REMOVE_TITLEBARS;
-use crate::STACKBAR_TAB_HEIGHT;

 #[allow(clippy::struct_field_names)]
 #[derive(
@@ -144,66 +143,55 @@ impl Workspace {
        Ok(())
    }

-    pub fn hide(&mut self, omit: Option<isize>) {
-        for window in self.floating_windows_mut().iter_mut().rev() {
-            let mut should_hide = omit.is_none();
-
-            if !should_hide {
-                if let Some(omit) = omit {
-                    if omit != window.hwnd {
-                        should_hide = true
-                    }
-                }
-            }
-
-            if should_hide {
+    pub fn hide(&mut self) {
+        for container in self.containers_mut() {
+            for window in container.windows_mut() {
                window.hide();
            }
        }

-        for container in self.containers_mut() {
-            container.hide(omit)
-        }
-
        if let Some(window) = self.maximized_window() {
            window.hide();
        }

        if let Some(container) = self.monocle_container_mut() {
-            container.hide(omit)
+            for window in container.windows_mut() {
+                window.hide();
+            }
+        }
+
+        for window in self.floating_windows() {
+            window.hide();
        }
    }

    pub fn restore(&mut self, mouse_follows_focus: bool) -> Result<()> {
        let idx = self.focused_container_idx();
        let mut to_focus = None;
-
        for (i, container) in self.containers_mut().iter_mut().enumerate() {
            if let Some(window) = container.focused_window_mut() {
+                window.restore();
+
                if idx == i {
                    to_focus = Option::from(*window);
                }
            }
-
-            container.restore();
        }

-        for container in self.containers_mut() {
-            container.restore();
+        if let Some(window) = self.maximized_window() {
+            window.maximize();
        }

        if let Some(container) = self.monocle_container_mut() {
-            container.restore();
+            for window in container.windows_mut() {
+                window.restore();
+            }
        }

        for window in self.floating_windows() {
            window.restore();
        }

-        if let Some(container) = self.focused_container_mut() {
-            container.focus_window(container.focused_window_idx());
-        }
-
        // Do this here to make sure that an error doesn't stop the restoration of other windows
        // Maximised windows should always be drawn at the top of the Z order
        if let Some(window) = to_focus {
@@ -288,23 +276,9 @@ impl Workspace {
                let should_remove_titlebars = REMOVE_TITLEBARS.load(Ordering::SeqCst);
                let no_titlebar = NO_TITLEBAR.lock().clone();

-                let focused_hwnd = self
-                    .focused_container()
-                    .ok_or_else(|| anyhow!("couldn't find a focused container"))?
-                    .focused_window()
-                    .ok_or_else(|| anyhow!("couldn't find a focused window"))?
-                    .hwnd;
-
-                let container_padding = self.container_padding().unwrap_or(0);
-                let containers = self.containers_mut();
-
-                for (i, container) in containers.iter_mut().enumerate() {
-                    let container_windows = container.windows().clone();
-                    let container_topbar = container.stackbar().clone();
-
-                    if let (Some(window), Some(layout)) =
-                        (container.focused_window_mut(), layouts.get(i))
-                    {
+                let windows = self.visible_windows_mut();
+                for (i, window) in windows.into_iter().enumerate() {
+                    if let (Some(window), Some(layout)) = (window, layouts.get(i)) {
                        if should_remove_titlebars && no_titlebar.contains(&window.exe()?) {
                            window.remove_title_bar()?;
                        } else if no_titlebar.contains(&window.exe()?) {
@@ -326,20 +300,6 @@ impl Workspace {
                            rect.add_padding(width);
                        }

-                        if let Some(stackbar) = container_topbar {
-                            stackbar.set_position(
-                                &stackbar.get_position_from_container_layout(layout),
-                                false,
-                            )?;
-
-                            stackbar.update(&container_windows, focused_hwnd)?;
-                            let tab_height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
-                            let total_height = tab_height + container_padding;
-
-                            rect.top += total_height;
-                            rect.bottom -= total_height;
-                        }
-
                        window.set_position(&rect, false)?;
                    }
                }
@@ -415,18 +375,7 @@ impl Workspace {
            .idx_for_window(hwnd)
            .ok_or_else(|| anyhow!("there is no window"))?;

-        let mut should_load = false;
-
-        if container.focused_window_idx() != window_idx {
-            should_load = true
-        }
-
        container.focus_window(window_idx);
-
-        if should_load {
-            container.load_focused_window();
-        }
-
        self.focus_container(container_idx);

        Ok(())
@@ -843,10 +792,6 @@ impl Workspace {
            if container.windows().is_empty() {
                self.containers_mut().remove(focused_idx);
                self.resize_dimensions_mut().remove(focused_idx);
-
-                if focused_idx == self.containers().len() {
-                    self.focus_container(focused_idx - 1);
-                }
            } else {
                container.load_focused_window();
            }
--- a/komorebic-no-console/Cargo.toml
+++ b/komorebic-no-console/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebic-no-console"
-version = "0.1.23"
+version = "0.1.22-dev.0"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "The command-line interface (without a console) for Komorebi, a tiling window manager for Windows"
 categories = ["cli", "tiling-window-manager", "windows"]
--- a/komorebic/Cargo.toml
+++ b/komorebic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.23"
+version = "0.1.22-dev.0"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "The command-line interface for Komorebi, a tiling window manager for Windows"
 categories = ["cli", "tiling-window-manager", "windows"]
@@ -19,20 +19,17 @@ color-eyre = { workspace = true }
 dirs = { workspace = true }
 dunce = { workspace = true }
 fs-tail = "0.1"
-heck = "0.5"
+heck = "0.4"
 lazy_static = "1"
-miette = { version = "7", features = ["fancy"] }
+miette = { version = "5", features = ["fancy"] }
 paste = "1"
 powershell_script = "1.0"
-reqwest = { version = "0.12", features = ["blocking"] }
+reqwest = { version = "0.11", features = ["blocking"] }
 serde = { version = "1", features = ["derive"] }
-serde_json = { workspace = true }
+serde_json = "1"
 serde_yaml = "0.9"
 sysinfo = "0.30"
 thiserror = "1"
 uds_windows = "1"
 which = "6"
-windows = { workspace = true }
-
-[build-dependencies]
-reqwest = { version = "0.12", features = ["blocking"] }
+windows = { workspace = true }
--- a/komorebic/build.rs
+++ b/komorebic/build.rs
@@ -1,8 +0,0 @@
-fn main() {
-    if std::fs::metadata("applications.yaml").is_err() {
-        let applications_yaml = reqwest::blocking::get(
-        "https://raw.githubusercontent.com/LGUG2Z/komorebi-application-specific-configuration/master/applications.yaml"
-    ).unwrap().text().unwrap();
-        std::fs::write("applications.yaml", applications_yaml).unwrap();
-    }
-}
--- a/komorebic/src/main.rs
+++ b/komorebic/src/main.rs
@@ -114,7 +114,7 @@ trait AhkFunction {
 struct ConfigurationError {
    message: String,
    #[source_code]
-    src: NamedSource<String>,
+    src: NamedSource,
    #[label("This bit here")]
    bad_bit: SourceSpan,
 }
@@ -1125,7 +1125,7 @@ enum SubCommand {
    /// Toggle title bars for whitelisted applications
    ToggleTitleBars,
    /// Identify an application that has overflowing borders
-    #[clap(hide = true)]
+    #[clap(arg_required_else_help = true)]
    #[clap(alias = "identify-border-overflow")]
    IdentifyBorderOverflowApplication(IdentifyBorderOverflowApplication),
    /// Enable or disable the active window border
@@ -1256,6 +1256,8 @@ fn main() -> Result<()> {
            }
        }
        SubCommand::Quickstart => {
+            let version = env!("CARGO_PKG_VERSION");
+
            let home_dir = dirs::home_dir().expect("could not find home dir");
            let config_dir = home_dir.join(".config");
            let local_appdata_dir = data_local_dir().expect("could not find localdata dir");
@@ -1263,13 +1265,21 @@ fn main() -> Result<()> {
            std::fs::create_dir_all(&config_dir)?;
            std::fs::create_dir_all(data_dir)?;

-            let komorebi_json = include_str!("../../docs/komorebi.example.json");
+            let komorebi_json = reqwest::blocking::get(
+                format!("https://raw.githubusercontent.com/LGUG2Z/komorebi/v{version}/komorebi.example.json")
+            )?.text()?;
            std::fs::write(HOME_DIR.join("komorebi.json"), komorebi_json)?;

-            let applications_yaml = include_str!("../applications.yaml");
+            let applications_yaml = reqwest::blocking::get(
+                "https://raw.githubusercontent.com/LGUG2Z/komorebi-application-specific-configuration/master/applications.yaml"
+            )?
+                .text()?;
            std::fs::write(HOME_DIR.join("applications.yaml"), applications_yaml)?;

-            let whkdrc = include_str!("../../docs/whkdrc.sample");
+            let whkdrc = reqwest::blocking::get(format!(
+                "https://raw.githubusercontent.com/LGUG2Z/komorebi/v{version}/whkdrc.sample"
+            ))?
+            .text()?;
            std::fs::write(config_dir.join("whkdrc"), whkdrc)?;

            println!("Example ~/komorebi.json, ~/.config/whkdrc and latest ~/applications.yaml files downloaded");
@@ -1357,7 +1367,7 @@ fn main() -> Result<()> {
                    let diagnostic = ConfigurationError {
                        message: msgs[0].to_string(),
                        src: NamedSource::new("komorebi.json", config_source.clone()),
-                        bad_bit: SourceSpan::new(offset, 2),
+                        bad_bit: SourceSpan::new(offset, 2.into()),
                    };

                    println!("{:?}", Report::new(diagnostic));
@@ -1871,13 +1881,6 @@ if (!(Get-Process whkd -ErrorAction SilentlyContinue))
                    }
                }
            }
-
-            println!("\nThank you for using komorebi!\n");
-            println!("* Become a sponsor https://github.com/sponsors/LGUG2Z - Even $1/month makes a big difference");
-            println!(
-                "* Subscribe to https://youtube.com/@LGUG2Z - Live dev videos and feature previews"
-            );
-            println!("* Join the Discord https://discord.gg/mGkn66PHkx - Chat, ask questions, share your desktops");
        }
        SubCommand::Stop(arg) => {
            if arg.whkd {
@@ -2063,6 +2066,9 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
        SubCommand::CompleteConfiguration => {
            send_message(&SocketMessage::CompleteConfiguration.as_bytes()?)?;
        }
+        SubCommand::AltFocusHack(arg) => {
+            send_message(&SocketMessage::AltFocusHack(arg.boolean_state.into()).as_bytes()?)?;
+        }
        SubCommand::IdentifyObjectNameChangeApplication(target) => {
            send_message(
                &SocketMessage::IdentifyObjectNameChangeApplication(target.identifier, target.id)
@@ -2080,6 +2086,12 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
                    .as_bytes()?,
            )?;
        }
+        SubCommand::IdentifyBorderOverflowApplication(target) => {
+            send_message(
+                &SocketMessage::IdentifyBorderOverflowApplication(target.identifier, target.id)
+                    .as_bytes()?,
+            )?;
+        }
        SubCommand::RemoveTitleBar(target) => {
            match target.identifier {
                ApplicationIdentifier::Exe => {}
@@ -2271,10 +2283,6 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
        SubCommand::GenerateStaticConfig => {
            print_query(&SocketMessage::GenerateStaticConfig.as_bytes()?);
        }
-        // Deprecated
-        SubCommand::AltFocusHack(_) | SubCommand::IdentifyBorderOverflowApplication(_) => {
-            println!("Command deprecated - this is now automatically handled by komorebi! 🎉");
-        }
    }

    Ok(())
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -53,7 +53,6 @@ nav:
  - Common workflows:
    - common-workflows/komorebi-config-home.md
    - common-workflows/active-window-border.md
-    - common-workflows/stackbar.md
    - common-workflows/remove-gaps.md
    - common-workflows/ignore-windows.md
    - common-workflows/force-manage-windows.md
@@ -63,23 +62,17 @@ nav:
    - common-workflows/custom-layouts.md
    - common-workflows/dynamic-layout-switching.md
 #    - common-workflows/autohotkey.md
-  - Release notes:
-    - release/v0-1-22.md
  - Configuration reference: https://komorebi.lgug2z.com/schema
  - CLI reference:
    - cli/quickstart.md
    - cli/start.md
    - cli/stop.md
    - cli/check.md
-    - cli/configuration.md
-    - cli/whkdrc.md
    - cli/state.md
    - cli/visible-windows.md
    - cli/query.md
-    - cli/subscribe-socket.md
-    - cli/unsubscribe-socket.md
-    - cli/subscribe-pipe.md
-    - cli/unsubscribe-pipe.md
+    - cli/subscribe.md
+    - cli/unsubscribe.md
    - cli/log.md
    - cli/quick-save-resize.md
    - cli/quick-load-resize.md
@@ -167,6 +160,7 @@ nav:
    - cli/reload-configuration.md
    - cli/watch-configuration.md
    - cli/complete-configuration.md
+    - cli/alt-focus-hack.md
    - cli/window-hiding-behaviour.md
    - cli/cross-monitor-move-behaviour.md
    - cli/toggle-cross-monitor-move-behaviour.md
@@ -182,6 +176,7 @@ nav:
    - cli/identify-layered-application.md
    - cli/remove-title-bar.md
    - cli/toggle-title-bars.md
+    - cli/identify-border-overflow-application.md
    - cli/active-window-border.md
    - cli/active-window-border-colour.md
    - cli/active-window-border-width.md
--- a/schema.asc.json
+++ b/schema.asc.json
@@ -44,8 +44,7 @@
      "enum": [
        "Exe",
        "Class",
-        "Title",
-        "Path"
+        "Title"
      ]
    },
    "ApplicationOptions": {
--- a/schema.json
+++ b/schema.json
@@ -133,129 +133,55 @@
        }
      }
    },
-    "active_window_border_style": {
-      "description": "Active window border style (default: System)",
-      "oneOf": [
-        {
-          "description": "Use the system border style",
-          "type": "string",
-          "enum": [
-            "System"
-          ]
-        },
-        {
-          "description": "Use the Windows 11-style rounded borders",
-          "type": "string",
-          "enum": [
-            "Rounded"
-          ]
-        },
-        {
-          "description": "Use the Windows 10-style square borders",
-          "type": "string",
-          "enum": [
-            "Square"
-          ]
-        }
-      ]
+    "active_window_border_offset": {
+      "description": "Offset of the active window border (default: -1)",
+      "type": "integer",
+      "format": "int32"
+    },
+    "active_window_border_width": {
+      "description": "Width of the active window border (default: 8)",
+      "type": "integer",
+      "format": "int32"
    },
    "app_specific_configuration_path": {
      "description": "Path to applications.yaml from komorebi-application-specific-configurations (default: None)",
      "type": "string"
    },
-    "border_offset": {
-      "description": "Offset of the window border (default: -1)",
-      "type": "integer",
-      "format": "int32"
-    },
    "border_overflow_applications": {
      "description": "Identify border overflow applications",
      "type": "array",
      "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
          },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
          }
-        ]
+        }
      }
    },
-    "border_width": {
-      "description": "Width of the window border (default: 8)",
-      "type": "integer",
-      "format": "int32"
-    },
    "cross_monitor_move_behaviour": {
      "description": "Determine what happens when a window is moved across a monitor boundary (default: Swap)",
      "oneOf": [
@@ -296,83 +222,35 @@
      "description": "Individual window floating rules",
      "type": "array",
      "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
          },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
          }
-        ]
+        }
      }
    },
    "focus_follows_mouse": {
@@ -427,7 +305,7 @@
      }
    },
    "invisible_borders": {
-      "description": "DEPRECATED from v0.1.22: no longer required",
+      "description": "Dimensions of Windows' own invisible borders; don't set these yourself unless you are told to",
      "type": "object",
      "required": [
        "bottom",
@@ -462,166 +340,70 @@
      "description": "Identify applications that have the WS_EX_LAYERED extended window style",
      "type": "array",
      "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
          },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
          }
-        ]
+        }
      }
    },
    "manage_rules": {
      "description": "Individual window force-manage rules",
      "type": "array",
      "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
          },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
          }
-        ]
+        }
      }
    },
    "monitor_index_preferences": {
@@ -743,8 +525,7 @@
                        "enum": [
                          "Exe",
                          "Class",
-                          "Title",
-                          "Path"
+                          "Title"
                        ]
                      },
                      "matching_strategy": {
@@ -755,11 +536,7 @@
                          "StartsWith",
                          "EndsWith",
                          "Contains",
-                          "Regex",
-                          "DoesNotEndWith",
-                          "DoesNotStartWith",
-                          "DoesNotEqual",
-                          "DoesNotContain"
+                          "Regex"
                        ]
                      }
                    }
@@ -774,8 +551,7 @@
                    "Rows",
                    "VerticalStack",
                    "HorizontalStack",
-                    "UltrawideVerticalStack",
-                    "Grid"
+                    "UltrawideVerticalStack"
                  ]
                },
                "layout_rules": {
@@ -789,8 +565,7 @@
                      "Rows",
                      "VerticalStack",
                      "HorizontalStack",
-                      "UltrawideVerticalStack",
-                      "Grid"
+                      "UltrawideVerticalStack"
                    ]
                  }
                },
@@ -821,8 +596,7 @@
                        "enum": [
                          "Exe",
                          "Class",
-                          "Title",
-                          "Path"
+                          "Title"
                        ]
                      },
                      "matching_strategy": {
@@ -833,11 +607,7 @@
                          "StartsWith",
                          "EndsWith",
                          "Contains",
-                          "Regex",
-                          "DoesNotEndWith",
-                          "DoesNotStartWith",
-                          "DoesNotEqual",
-                          "DoesNotContain"
+                          "Regex"
                        ]
                      }
                    }
@@ -857,83 +627,35 @@
      "description": "Identify applications that send EVENT_OBJECT_NAMECHANGE on launch (very rare)",
      "type": "array",
      "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
          },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
          }
-        ]
+        }
      }
    },
    "resize_delta": {
@@ -941,224 +663,39 @@
      "type": "integer",
      "format": "int32"
    },
-    "stackbar": {
-      "type": "object",
-      "properties": {
-        "height": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "mode": {
-          "type": "string",
-          "enum": [
-            "Always",
-            "Never",
-            "OnStack"
-          ]
-        },
-        "tabs": {
-          "type": "object",
-          "properties": {
-            "background": {
-              "anyOf": [
-                {
-                  "description": "Colour represented as RGB",
-                  "type": "object",
-                  "required": [
-                    "b",
-                    "g",
-                    "r"
-                  ],
-                  "properties": {
-                    "b": {
-                      "description": "Blue",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    },
-                    "g": {
-                      "description": "Green",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    },
-                    "r": {
-                      "description": "Red",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    }
-                  }
-                },
-                {
-                  "description": "Colour represented as Hex",
-                  "type": "string"
-                }
-              ]
-            },
-            "focused_text": {
-              "anyOf": [
-                {
-                  "description": "Colour represented as RGB",
-                  "type": "object",
-                  "required": [
-                    "b",
-                    "g",
-                    "r"
-                  ],
-                  "properties": {
-                    "b": {
-                      "description": "Blue",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    },
-                    "g": {
-                      "description": "Green",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    },
-                    "r": {
-                      "description": "Red",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    }
-                  }
-                },
-                {
-                  "description": "Colour represented as Hex",
-                  "type": "string"
-                }
-              ]
-            },
-            "unfocused_text": {
-              "anyOf": [
-                {
-                  "description": "Colour represented as RGB",
-                  "type": "object",
-                  "required": [
-                    "b",
-                    "g",
-                    "r"
-                  ],
-                  "properties": {
-                    "b": {
-                      "description": "Blue",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    },
-                    "g": {
-                      "description": "Green",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    },
-                    "r": {
-                      "description": "Red",
-                      "type": "integer",
-                      "format": "uint32",
-                      "minimum": 0.0
-                    }
-                  }
-                },
-                {
-                  "description": "Colour represented as Hex",
-                  "type": "string"
-                }
-              ]
-            },
-            "width": {
-              "type": "integer",
-              "format": "int32"
-            }
-          }
-        }
-      }
-    },
    "tray_and_multi_window_applications": {
      "description": "Identify tray and multi-window applications",
      "type": "array",
      "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
          },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
          }
-        ]
+        }
      }
    },
    "unmanaged_window_operation_behaviour": {
--- a/whkdrc.sample
+++ b/whkdrc.sample
@@ -0,0 +1,63 @@
+.shell powershell
+
+# Reload whkd configuration
+# alt + o                 : taskkill /f /im whkd.exe && start /b whkd # if shell is cmd
+alt + o                 : taskkill /f /im whkd.exe; Start-Process whkd -WindowStyle hidden # if shell is pwsh / powershell
+alt + shift + o         : komorebic reload-configuration
+
+# App shortcuts - these require shell to be pwsh / powershell
+# The apps will be focused if open, or launched if not open
+# alt + f                 : if ($wshell.AppActivate('Firefox') -eq $False) { start firefox }
+# alt + b                 : if ($wshell.AppActivate('Chrome') -eq $False) { start chrome }
+
+# Focus windows
+alt + h                 : komorebic focus left
+alt + j                 : komorebic focus down
+alt + k                 : komorebic focus up
+alt + l                 : komorebic focus right
+alt + shift + oem_4     : komorebic cycle-focus previous # oem_4 is [
+alt + shift + oem_6     : komorebic cycle-focus next # oem_6 is ]
+
+# Move windows
+alt + shift + h         : komorebic move left
+alt + shift + j         : komorebic move down
+alt + shift + k         : komorebic move up
+alt + shift + l         : komorebic move right
+alt + shift + return    : komorebic promote
+
+# Stack windows
+alt + left              : komorebic stack left
+alt + down              : komorebic stack down
+alt + up                : komorebic stack up
+alt + right             : komorebic stack right
+alt + oem_1             : komorebic unstack # oem_1 is ;
+alt + oem_4             : komorebic cycle-stack previous # oem_4 is [
+alt + oem_6             : komorebic cycle-stack next # oem_6 is ]
+
+# Resize
+alt + oem_plus          : komorebic resize-axis horizontal increase
+alt + oem_minus         : komorebic resize-axis horizontal decrease
+alt + shift + oem_plus  : komorebic resize-axis vertical increase
+alt + shift + oem_minus : komorebic resize-axis vertical decrease
+
+# Manipulate windows
+alt + t                 : komorebic toggle-float
+alt + shift + f         : komorebic toggle-monocle
+
+# Window manager options
+alt + shift + r         : komorebic retile
+alt + p                 : komorebic toggle-pause
+
+# Layouts
+alt + x                 : komorebic flip-layout horizontal
+alt + y                 : komorebic flip-layout vertical
+
+# Workspaces
+alt + 1                 : komorebic focus-workspace 0
+alt + 2                 : komorebic focus-workspace 1
+alt + 3                 : komorebic focus-workspace 2
+
+# Move windows across workspaces
+alt + shift + 1         : komorebic move-to-workspace 0
+alt + shift + 2         : komorebic move-to-workspace 1
+alt + shift + 3         : komorebic move-to-workspace 2