[wip] volume

Merge pull request #92 from JakeStanger/update_flake_lock_action
Update flake.lock
2023-04-01 13:07:47 +01:00 · 2023-04-01 11:14:03 +01:00 · 2023-04-01 00:57:22 +00:00 · 2023-03-29 12:51:55 +01:00 · 2023-03-29 01:45:40 -07:00 · 2023-03-19 16:37:20 +00:00
99 changed files with 8667 additions and 3021 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,50 @@
+---
+name: Bug report
+about: Report an issue with the bar not working as expected
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+> A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+> A clear and concise description of what you expected to happen.
+
+**System information:**
+ - Distro: [e.g. Arch Linux, Ubuntu 22.10]
+- Compositor: [e.g. Sway]
+ - Ironbar version: [e.g. 0.8.0]
+
+**Configuration**
+> Share your bar configuration and stylesheet as applicable:
+
+<details><summary>Config</summary>
+
+```
+
+```
+</details>
+
+
+<details><summary>Styles</summary>
+
+```css
+
+```
+</details>
+
+**Additional context**
+> Add any other context about the problem here.
+
+**Screenshots**
+> If applicable, add screenshots to help explain your problem.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+> A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+
+**Describe the solution you'd like**
+> A clear and concise description of what you want to happen.
+> The more info here about what you are trying to achieve, the better - there's likely more than one way to go about implementing a solution.
+
+**Describe alternatives you've considered**
+> A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+> Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,10 @@
+---
+name: Other
+about: Any other issue type
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,12 +23,20 @@ jobs:
          override: true

      - name: Install build deps
-        run: sudo apt install libgtk-3-dev libgtk-layer-shell-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install libgtk-3-dev libgtk-layer-shell-dev

      - name: Check formatting
        run: cargo fmt --check

-      - name: Clippy
+      - name: Clippy (base features)
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --no-default-features --features config+json
+
+      - name: Clippy (all features)
        uses: actions-rs/clippy-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
@@ -50,14 +58,14 @@ jobs:
    steps:
      - uses: actions/checkout@v3

-      - uses: cachix/install-nix-action@v17
+      - uses: cachix/install-nix-action@v20
        with:
          install_url: https://nixos.org/nix/install
          extra_nix_config: |
            auto-optimise-store = true
            experimental-features = nix-command flakes

-      - uses: cachix/cachix-action@v11
+      - uses: cachix/cachix-action@v12
        with:
          name: jakestanger
          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -18,7 +18,9 @@ jobs:
          override: true

      - name: Install build deps
-        run: sudo apt install libgtk-3-dev libgtk-layer-shell-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install libgtk-3-dev libgtk-layer-shell-dev

      - name: Update CHANGELOG
        id: changelog
--- a/.github/workflows/update-nix-flake-lock.yml
+++ b/.github/workflows/update-nix-flake-lock.yml
@@ -13,13 +13,13 @@ jobs:
        uses: actions/checkout@v2

      - name: Install Nix
-        uses: cachix/install-nix-action@v16
+        uses: cachix/install-nix-action@v20
        with:
          extra_nix_config: |
            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@vX
+        uses: DeterminateSystems/update-flake-lock@v15
        with:
          pr-title: "Update flake.lock" # Title of PR to be created
          pr-labels: |                  # Labels to be set on the PR
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,126 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [v0.10.0] - 2023-02-01
+### :boom: BREAKING CHANGES
+- due to [`3cf9be8`](https://github.com/JakeStanger/ironbar/commit/3cf9be89fd74face31806165f66b68052b093bab) - global icon theme setting *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  This removes the `icon_theme` option from `launcher` and `focused`. You will need to set this at the top of your config instead.
+
+- due to [`90f57d6`](https://github.com/JakeStanger/ironbar/commit/90f57d61b94c50c98a6f55de18c6edf3d18aa3fa) - remove irrelevant `icon` format token *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  (Missed from #96141d4) The `{icon}` token has been removed from the `music` module due to incompatibility with the new image/icon support. The icon now always displays as a separate widget before the label and should be removed from your formatting string.
+
+
+### :sparkles: New Features
+- [`8691824`](https://github.com/JakeStanger/ironbar/commit/8691824db1a12c3f3589ff8b5315b8dba5cb8aec) - **music**: ability to truncate button text *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`07dbf78`](https://github.com/JakeStanger/ironbar/commit/07dbf780105027b533b0bb34c9ae3e4e96f29f4a) - **focused**: ability to truncate label text *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`393800a`](https://github.com/JakeStanger/ironbar/commit/393800aaa2093b9257c43fde8bdb8399f26ebc74) - **custom**: image widget *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`3cf9be8`](https://github.com/JakeStanger/ironbar/commit/3cf9be89fd74face31806165f66b68052b093bab) - global icon theme setting *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`b054c17`](https://github.com/JakeStanger/ironbar/commit/b054c17d14628c9188bfa9aed506ea1de3051f9c) - **workspaces**: support for using images in `name_map` *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`96141d4`](https://github.com/JakeStanger/ironbar/commit/96141d49907412ea26d23ef30c10ade8b32b89b9) - **music**: support for using images in `name_map`, additional icon options *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`c347b6c`](https://github.com/JakeStanger/ironbar/commit/c347b6c9449ce4e16e2e133d7dd35544ab9a533c) - add feature flags *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :bug: Bug Fixes
+- [`5772711`](https://github.com/JakeStanger/ironbar/commit/57727111923a419f9b7613103283aa4cf6bd082c) - **music**: remote mpris album art not showing *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`5fb4125`](https://github.com/JakeStanger/ironbar/commit/5fb412572f3da60ac482a1960d891f70bc29287b) - **tray**: some init issues *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`058c8f4`](https://github.com/JakeStanger/ironbar/commit/058c8f4228f9f7faa66cda9dd1636ea32e9de68b) - **hyprland**: issues with tracking workspaces *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`51d2c22`](https://github.com/JakeStanger/ironbar/commit/51d2c2279f50add992def0d58cfaa9890ea3d041) - **images**: incorrectly resolving non-files *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :recycle: Refactors
+- [`012762e`](https://github.com/JakeStanger/ironbar/commit/012762e10203fb2d58160acdae4dc7ca7689b131) - swap out some code for existing macros *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`9750255`](https://github.com/JakeStanger/ironbar/commit/97502559b30c51e77c1dd9a7d794a88756294c83) - **music**: split config code into separate file *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`15f0857`](https://github.com/JakeStanger/ironbar/commit/15f0857859d5d4a590b60b6b1a4347b4b84a58a1) - replace icon loading with improved general image loading *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :memo: Documentation Changes
+- [`1ed3220`](https://github.com/JakeStanger/ironbar/commit/1ed3220733c2dcb7c5e5cbf377b3324d3183609e) - update CHANGELOG.md for v0.9.0 [skip ci] *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`90f57d6`](https://github.com/JakeStanger/ironbar/commit/90f57d61b94c50c98a6f55de18c6edf3d18aa3fa) - **music**: remove irrelevant `icon` format token *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`6a39905`](https://github.com/JakeStanger/ironbar/commit/6a39905b4333582fbcda81a66a9b91055333d698) - **compiling**: add missing full stop *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`7b23e61`](https://github.com/JakeStanger/ironbar/commit/7b23e61e7dedf2736a30580b6c1aa84e002c462c) - **wiki**: update screenshots and examples *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+
+## [v0.9.0] - 2023-01-28
+### :boom: BREAKING CHANGES
+- due to [`fa67d07`](https://github.com/JakeStanger/ironbar/commit/fa67d077b136b109edf6dbaa11a33aebf3e044b4) - mouse event config options *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  `on_click` is now called `on_click_left` for consistency with new options.
+
+- due to [`6d8e647`](https://github.com/JakeStanger/ironbar/commit/6d8e647f123e54ba389c5ab2fe908200aa5e4cf6) - mpris support *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  The `mpd` module has been renamed to `music`. You will need to update the `type` value in your config and add `player_type` to continue using MPD. You will also need to update your styles.
+
+
+### :sparkles: New Features
+- [`1dd5863`](https://github.com/JakeStanger/ironbar/commit/1dd586343143bfd501a44c6556719fac9d582d6b) - better surface some config error messages *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`fa67d07`](https://github.com/JakeStanger/ironbar/commit/fa67d077b136b109edf6dbaa11a33aebf3e044b4) - mouse event config options *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`6d8e647`](https://github.com/JakeStanger/ironbar/commit/6d8e647f123e54ba389c5ab2fe908200aa5e4cf6) - mpris support *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`6e5d0c1`](https://github.com/JakeStanger/ironbar/commit/6e5d0c1e8c0b5d7e330608fc835e1e9733f156de) - **workspaces**: hyprland support *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`9ba28fe`](https://github.com/JakeStanger/ironbar/commit/9ba28fe7faf84e06febc2ffea089442f8f5b90a2) - **workspaces**: better ordering *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :bug: Bug Fixes
+- [`e1f523c`](https://github.com/JakeStanger/ironbar/commit/e1f523cf2a15b74a5c570dd7440db4c1b476d782) - **music**: popup artist label using wrong name *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`08cfbbc`](https://github.com/JakeStanger/ironbar/commit/08cfbbc2eaf6e74780dd7196efcc15ea6d2e7d12) - **music**: unable to go to prev with mpris *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`0cefcbd`](https://github.com/JakeStanger/ironbar/commit/0cefcbd02b0af518352e35060644f281da249d3e) - **music**: wrong widget name on vol slider *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`90cd078`](https://github.com/JakeStanger/ironbar/commit/90cd078973b23b2291cf156e46729842f33c1806) - **mpd**: stops working if connection lost *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :recycle: Refactors
+- [`2c1b292`](https://github.com/JakeStanger/ironbar/commit/2c1b2924d4a103183d3974ac066623a80277a79a) - move most of the horrible `add_module` macro content into proper functions *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`fd2d7e5`](https://github.com/JakeStanger/ironbar/commit/fd2d7e5c7ab8de50c4621b19d07d8b012a451564) - move startup logging code to logging module *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`9d5049d`](https://github.com/JakeStanger/ironbar/commit/9d5049dde01cdb76f4772f8ce8f61a8b5bad3a50) - standardise error messages *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`5e21cbc`](https://github.com/JakeStanger/ironbar/commit/5e21cbcca6cc30d725acdea0f6561cfd6acdcc3c) - macros to reduce repeated code *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`ea2c84d`](https://github.com/JakeStanger/ironbar/commit/ea2c84d1bd15798e32496397c4a6aa42fab39d95) - general code tidy-up *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`0d7ab54`](https://github.com/JakeStanger/ironbar/commit/0d7ab541604691455ed39c73e039ac0635307bc8) - remove redundant clone *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :memo: Documentation Changes
+- [`b97f018`](https://github.com/JakeStanger/ironbar/commit/b97f018e81aa55a871a12aa3e1e4b07b1f8eb50f) - update CHANGELOG.md for v0.8.0 [skip ci] *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`c223892`](https://github.com/JakeStanger/ironbar/commit/c223892a57b29ae56431fc585b8cec503f3206c7) - **workspaces**: update for hyprland/new ordering option *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+
+## [v0.8.0] - 2022-11-30
+### :boom: BREAKING CHANGES
+- due to [`df77020`](https://github.com/JakeStanger/ironbar/commit/df77020c5277ae9e379bb4fd67c221be5cb20426) - use snake_case for module tokens for consistency *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  This renames the module from `sys-info` to `sys_info`, and almost every formatting token from `kebab-case` to `snake_case`. Any use of this module will need to be updated.
+
+- due to [`8c75bc4`](https://github.com/JakeStanger/ironbar/commit/8c75bc46ac2885a748d31df9261d988cc797e916) - rename `path` to `cmd` for consistency *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  This changes the option in the `script` module. Any uses of the module must be updated to use the new option name.
+
+- due to [`e274ba3`](https://github.com/JakeStanger/ironbar/commit/e274ba39cd6d8f1c73033ac1e60e5bce89205ce2) - rename `exec` to `on_click` for consistency *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  This changes the option on buttons in the `custom` module. Any uses of the module must be updated to use the new custom widget attribute name.
+
+
+### :sparkles: New Features
+- [`73158c2`](https://github.com/JakeStanger/ironbar/commit/73158c2fce2880347b88d58541dea000534996c8) - **script**: new watch mode *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`a3f90ad`](https://github.com/JakeStanger/ironbar/commit/a3f90adaf19aebed7020eeb44b91250af080d313) - add nix flake support *(commit by [@yavko](https://github.com/yavko))*
+- [`c9e66d4`](https://github.com/JakeStanger/ironbar/commit/c9e66d4664137c50aba4aecdc3a3ba43d3da11fe) - common module options (`show_if`, `on_click`, `tooltip`) *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`5d153a0`](https://github.com/JakeStanger/ironbar/commit/5d153a02fc9b113bb77a04596b806edd182fc5d3) - **custom**: ability to embed scripts in labels for dynamic content *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`d20972c`](https://github.com/JakeStanger/ironbar/commit/d20972cb32714627d0cca947021453979c76dd03) - dynamic tooltips *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :recycle: Refactors
+- [`ff17ec1`](https://github.com/JakeStanger/ironbar/commit/ff17ec1996cf344663e84e79d11b08dc84b97635) - various changes based on rust 1.65 clippy *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`4662f60`](https://github.com/JakeStanger/ironbar/commit/4662f60ac54165be6fb7aea12c245309db0fe5d6) - move various clients to own folder *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`0fb5fa8`](https://github.com/JakeStanger/ironbar/commit/0fb5fa8c2a166c3d46b006ceb0d53af076824ff4) - use latest `libcorn` with serde support *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`df77020`](https://github.com/JakeStanger/ironbar/commit/df77020c5277ae9e379bb4fd67c221be5cb20426) - **sys_info**: use snake_case for module tokens for consistency *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`8c75bc4`](https://github.com/JakeStanger/ironbar/commit/8c75bc46ac2885a748d31df9261d988cc797e916) - **script**: rename `path` to `cmd` for consistency *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`e274ba3`](https://github.com/JakeStanger/ironbar/commit/e274ba39cd6d8f1c73033ac1e60e5bce89205ce2) - **custom**: rename `exec` to `on_click` for consistency *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`64f5404`](https://github.com/JakeStanger/ironbar/commit/64f54040ef626157af6b6a9ce5258507a10a23fb) - move dynamic_label.rs to dynamic_string.rs and fix failing test *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :white_check_mark: Tests
+- [`907a565`](https://github.com/JakeStanger/ironbar/commit/907a565f3d418a276dfb454e1189ddede1814291) - **dynamic label**: do not run if cannot initialise gtk *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :memo: Documentation Changes
+- [`1c032ae`](https://github.com/JakeStanger/ironbar/commit/1c032ae8e3a38b82c286bab7d102842f14b708e1) - update CHANGELOG.md for v0.7.0 [skip ci] *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`58d55db`](https://github.com/JakeStanger/ironbar/commit/58d55db6600fe2f9b23ae8ec6a50a686d2acaf65) - migrate wiki into main repo *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`c480296`](https://github.com/JakeStanger/ironbar/commit/c48029664d5f58bf73faa2931f34b38b8b184d25) - **script**: improve doc comment *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`8c77410`](https://github.com/JakeStanger/ironbar/commit/8c774100f1c8ea051284c6950339a2c8ed59a52a) - **script**: add information on new mode options *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`c4cdf4b`](https://github.com/JakeStanger/ironbar/commit/c4cdf4be8ba83f3669158a1552eab4a840085204) - update example configs *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`ec69649`](https://github.com/JakeStanger/ironbar/commit/ec69649a04f6199953836e51c2efe1fe2a19e320) - update example configs *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`1320639`](https://github.com/JakeStanger/ironbar/commit/1320639d4e6b7c8cd8f861b26b2b854504775ef0) - add custom power menu example *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`afedf02`](https://github.com/JakeStanger/ironbar/commit/afedf0214d3a71f6283c70bd3a110d24f68d2fdf) - add link to new custom power menu example *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+
 ## [v0.7.0] - 2022-11-05
 ### :sparkles: New Features
 - [`fad90fd`](https://github.com/JakeStanger/ironbar/commit/fad90fdad683a612497ac7822a66a90f43fce0a2) - **sys-info**: add loads more formatting tokens *(commit by [@JakeStanger](https://github.com/JakeStanger))*
@@ -110,4 +230,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [v0.5.1]: https://github.com/JakeStanger/ironbar/compare/v0.5.0...v0.5.1
 [v0.5.2]: https://github.com/JakeStanger/ironbar/compare/v0.5.1...v0.5.2
 [v0.6.0]: https://github.com/JakeStanger/ironbar/compare/v0.5.2...v0.6.0
-[v0.7.0]: https://github.com/JakeStanger/ironbar/compare/v0.6.0...v0.7.0
+[v0.7.0]: https://github.com/JakeStanger/ironbar/compare/v0.6.0...v0.7.0
+[v0.8.0]: https://github.com/JakeStanger/ironbar/compare/v0.7.0...v0.8.0
+[v0.9.0]: https://github.com/JakeStanger/ironbar/compare/v0.8.0...v0.9.0
+[v0.10.0]: https://github.com/JakeStanger/ironbar/compare/v0.9.0...v0.10.0
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,16 +1,59 @@
 [package]
 name = "ironbar"
-version = "0.8.0"
+version = "0.10.0"
 edition = "2021"
 license = "MIT"
 description = "Customisable GTK Layer Shell wlroots/sway bar"

+[features]
+default = [
+    "http",
+    "config+all",
+    "clipboard",
+    "clock",
+    "music+all",
+    "sys_info",
+    "tray",
+    "volume+all",
+    "workspaces+all"
+]
+
+http = ["dep:reqwest"]
+
+"config+all" = ["config+json", "config+yaml", "config+toml", "config+corn"]
+"config+json" = ["universal-config/json"]
+"config+yaml" = ["universal-config/yaml"]
+"config+toml" = ["universal-config/toml"]
+"config+corn" = ["universal-config/corn"]
+
+clipboard = ["nix"]
+
+clock = ["chrono"]
+
+music = ["regex"]
+"music+all" = ["music", "music+mpris", "music+mpd"]
+"music+mpris" = ["music", "mpris"]
+"music+mpd" = ["music", "mpd_client"]
+
+sys_info = ["sysinfo", "regex"]
+
+tray = ["stray"]
+
+volume = []
+"volume+all" = ["volume", "volume+pulse"]
+"volume+pulse" = ["libpulse-binding", "libpulse-glib-binding"]
+
+workspaces = ["futures-util"]
+"workspaces+all" = ["workspaces", "workspaces+sway", "workspaces+hyprland"]
+"workspaces+sway" = ["workspaces", "swayipc-async"]
+"workspaces+hyprland" = ["workspaces", "hyprland"]
+
 [dependencies]
-derive_builder = "0.11.2"
-gtk = "0.16.0"
-gtk-layer-shell = "0.5.0"
-glib = "0.16.2"
-tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread", "time", "process"] }
+# core
+gtk = "0.17.0"
+gtk-layer-shell = "0.6.0"
+glib = "0.17.5"
+tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread", "time", "process", "sync", "io-util", "net"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 tracing-error = "0.2.0"
@@ -18,23 +61,46 @@ tracing-appender = "0.2.2"
 strip-ansi-escapes = "0.1.1"
 color-eyre = "0.6.2"
 serde = { version = "1.0.141", features = ["derive"] }
-serde_json = "1.0.82"
-serde_yaml = "0.9.4"
-toml = "0.5.9"
-libcorn = "0.6.0"
-lazy_static = "1.4.0"
-async_once = "0.2.6"
 indexmap = "1.9.1"
-futures-util = "0.3.21"
-chrono = "0.4.19"
-regex = { version = "1.6.0", default-features = false, features = ["std"] }
-stray = { version = "0.1.2" }
 dirs = "4.0.0"
 walkdir = "2.3.2"
 notify = { version = "5.0.0", default-features = false }
-mpd_client = "1.0.0"
-swayipc-async = { version = "2.0.1" }
-sysinfo = "0.26.4"
 wayland-client = "0.29.5"
 wayland-protocols = { version = "0.29.5", features = ["unstable_protocols", "client"] }
-smithay-client-toolkit = { version = "0.16.0", default-features = false, features = ["calloop"] }
+smithay-client-toolkit = { version = "0.16.0", default-features = false, features = ["calloop"] }
+universal-config = { version = "0.2.1", default_features = false }
+
+lazy_static = "1.4.0"
+async_once = "0.2.6"
+cfg-if = "1.0.0"
+
+# http
+reqwest = { version = "0.11.14", optional = true }
+
+# clipboard
+nix = { version = "0.26.2", optional = true }
+
+# clock
+chrono = { version = "0.4.19", optional = true }
+
+# music
+mpd_client = { version = "1.0.0", optional = true }
+mpris = { version = "2.0.0", optional = true }
+
+# sys_info
+sysinfo = { version = "0.27.0", optional = true }
+
+# tray
+stray = { version = "0.1.3", optional = true }
+
+# volume
+libpulse-binding = { version = "2.27.1", optional = true }
+libpulse-glib-binding = { version = "2.27.1", optional = true }
+
+# workspaces
+swayipc-async = { version = "2.0.1", optional = true }
+hyprland = { version = "0.3.0", optional = true }
+futures-util = { version = "0.3.21", optional = true }
+
+# shared
+regex = { version = "1.6.0", default-features = false, features = ["std"], optional = true } # music, sys_info
--- a/README.md
+++ b/README.md
@@ -6,13 +6,23 @@ It uses GTK3 and gtk-layer-shell.
 The bar can be styled to your liking using CSS and hot-loads style changes.
 For information and examples on styling please see the [wiki](https://github.com/JakeStanger/ironbar/wiki).

-![Screenshot of fully configured bar with MPD widget open](https://user-images.githubusercontent.com/5057870/184539623-92d56a44-a659-49a9-91f9-5cdc453e5dfb.png)
+![Screenshot of fully configured bar with MPD widget open](https://f.jstanger.dev/github/ironbar/bar.png?raw)

+## Features
+
+- First-class support for Sway and Hyprland, but should (mostly) work on any wlroots compositor.
+- Fully themeable with CSS and hot-loaded styles. 
+- Support for multiple configuration languages.
+- Popups used by widgets to show rich content and controls on click.
+- Out of the box widgets which can be used to create anything from a lightweight to a more traditional desktop experience.
+- Ability to create custom widgets (including popups), run scripts and inject dynamic content. 

 ## Installation

 ### Cargo

+Ensure you have the [build dependencies](https://github.com/JakeStanger/ironbar/wiki/compiling#Build-requirements) installed.
+
 ```sh
 cargo install ironbar
 ```
@@ -29,9 +39,11 @@ yay -S ironbar-git

 ### Nix Flake

+A flake is included with the repo which can be used with home-manager.
+
 #### Example
-Here is an example nix flake that uses ironbar, this is just a 
-proof of concept, please adapt it to your config
+
+Here is an example nix flake that uses Ironbar.

 ```nix
 {
@@ -58,6 +70,8 @@ proof of concept, please adapt it to your config
            enable = true;
            config = {};
            style = "";
+            package = inputs.ironbar;
+            features = ["feature" "another_feature"];
          };
        }
      ];
@@ -67,11 +81,14 @@ proof of concept, please adapt it to your config
 ```

 #### Binary Caching
-There is also a cachix cache at `https://app.cachix.org/cache/jakestanger`
-incase you don't want to compile ironbar!
+
+There is a Cachix cache available at `https://app.cachix.org/cache/jakestanger`
+in case you don't want to compile Ironbar.

 ### Source

+Ensure you have the [build dependencies](https://github.com/JakeStanger/ironbar/wiki/compiling#Build-requirements) installed.
+
 ```sh
 git clone https://github.com/jakestanger/ironbar.git
 cd ironbar
@@ -80,6 +97,9 @@ cargo build --release
 install target/release/ironbar ~/.local/bin/ironbar
 ```

+By default, all features are enabled. 
+See [here](https://github.com/JakeStanger/ironbar/wiki/compiling#features) for controlling which features are included.
+
 [repo](https://github.com/jakestanger/ironbar)

 ## Running
--- a/docs/Compiling.md
+++ b/docs/Compiling.md
@@ -0,0 +1,74 @@
+You can compile Ironbar from source using `cargo`. 
+Just clone the repo and build:
+
+```sh
+git clone https://github.com/jakestanger/ironbar.git
+cd ironbar
+cargo build --release
+# change path to wherever you want to install
+install target/release/ironbar ~/.local/bin/ironbar
+```
+
+## Build requirements
+
+To build from source, you must have GTK (>= 3.22) and GTK Layer Shell installed.
+
+### Arch
+
+```shell
+pacman -S gtk3 gtk-layer-shell
+```
+
+### Ubuntu/Debian
+
+```shell
+apt install libgtk-3-dev libgtk-layer-shell-dev
+```
+
+### Fedora
+
+```shell
+dnf install gtk3 gtk-layer-shell
+```
+
+## Features
+
+By default, all features are enabled for convenience. This can result in a significant compile time.
+If you know you are not going to need all the features, you can compile with only the features you need.
+
+As of `v0.10.0`, compiling with no features is about 33% faster. 
+On a 3800X, it takes about 60 seconds for no features and 90 seconds for all. 
+This difference is expected to increase as the bar develops. 
+
+Features containing a `+` can be stacked, for example `config+json` and `config+yaml` could both be enabled.
+
+To build using only specific features, disable default features and pass a comma separated list to `cargo build`:
+
+```shell
+cargo build --release --no-default-features \
+  --features http,config+json,clock
+```
+
+> ⚠ Make sure you enable at least one `config` feature otherwise you will not be able to start the bar!
+
+| Feature             | Description                                                                       |
+|---------------------|-----------------------------------------------------------------------------------|
+| **Core**            |                                                                                   |
+| http                | Enables HTTP features. Currently this includes the ability to load remote images. |
+| config+all          | Enables support for all configuration languages.                                  |
+| config+json         | Enables configuration support for JSON.                                           |
+| config+yaml         | Enables configuration support for YAML.                                           |
+| config+toml         | Enables configuration support for TOML.                                           |
+| config+corn         | Enables configuration support for [Corn](https://github.com/jakestanger.corn).    |
+| **Modules**         |                                                                                   |
+| clipboard           | Enables the `clipboard` module.                                                   |
+| clock               | Enables the `clock` module.                                                       |
+| music+all           | Enables the `music` module with support for all player types.                     |
+| music+mpris         | Enables the `music` module with MPRIS support.                                    |
+| music+mpd           | Enables the `music` module with MPD support.                                      |
+| sys_info            | Enables the `sys_info` module.                                                    |
+| tray                | Enables the `tray` module.                                                        |
+| workspaces+all      | Enables the `workspaces` module with support for all compositors.                 |
+| workspaces+sway     | Enables the `workspaces` module with support for Sway.                            |
+| workspaces+hyprland | Enables the `workspaces` module with support for Hyprland.                        |
+
--- a/docs/Configuration
+++ b/docs/Configuration
@@ -1,10 +1,12 @@
 By default, you get a single bar at the bottom of all your screens.
 To change that, you'll unsurprisingly need a config file.

-This page details putting together the skeleton for your config to get you to a stage where you can start configuring modules.
-It may look long and overwhelming, but that is just because the bar supports a lot of scenarios! 
+This page details putting together the skeleton for your config to get you to a stage where you can start configuring
+modules.
+It may look long and overwhelming, but that is just because the bar supports a lot of scenarios!

-If you want to see some ready-to-go config files check the [examples folder](https://github.com/JakeStanger/ironbar/tree/master/examples) 
+If you want to see some ready-to-go config files check
+the [examples folder](https://github.com/JakeStanger/ironbar/tree/master/examples)
 and the example pages in the sidebar.

 ## 1. Create config file
@@ -239,7 +241,7 @@ monitors:
 <details>
 <summary>Corn</summary>

-```
+```corn
 {
  monitors.DP-1 = [
    { start = [] }
@@ -270,6 +272,11 @@ The following table lists each of the top-level bar config options:
 | `position`        | `top` or `bottom` or `left` or `right` | `bottom` | The bar's position on screen.                                                           |
 | `anchor_to_edges` | `boolean`                              | `false`  | Whether to anchor the bar to the edges of the screen. Setting to false centres the bar. |
 | `height`          | `integer`                              | `42`     | The bar's height in pixels.                                                             |
+| `margin.top`      | `integer`                              | `0`      | The margin on the top of the bar                                                        |
+| `margin.bottom`   | `integer`                              | `0`      | The margin on the bottom of the bar                                                     |
+| `margin.left`     | `integer`                              | `0`      | The margin on the left of the bar                                                       |
+| `margin.right`    | `integer`                              | `0`      | The margin on the right of the bar                                                      |
+| `icon_theme`      | `string`                               | `null`   | Name of the GTK icon theme to use. Leave blank to use default.                          |
 | `start`           | `Module[]`                             | `[]`     | Array of left or top modules.                                                           |
 | `center`          | `Module[]`                             | `[]`     | Array of center modules.                                                                |
 | `end`             | `Module[]`                             | `[]`     | Array of right or bottom modules.                                                       |
@@ -281,8 +288,12 @@ For details on available modules and each of their config options, check the sid

 For information on the `Script` type, and embedding scripts in strings, see [here](script).

-| Name       | Type               | Default | Description                                                                                                        |
-|------------|--------------------|---------|--------------------------------------------------------------------------------------------------------------------|
-| `show_if`  | `Script [polling]` | `null`  | Polls the script to check its exit code. If exit code is zero, the module is shown. For other codes, it is hidden. |
-| `on_click` | `Script [polling]` | `null`  | Runs the script when the module is clicked.                                                                        |
-| `tooltip`  | `string`           | `null`  | Shows this text on hover. Supports embedding scripts between `{{double braces}}`.                                  |
+| Name              | Type               | Default | Description                                                                                                        |
+|-------------------|--------------------|---------|--------------------------------------------------------------------------------------------------------------------|
+| `show_if`         | `Script [polling]` | `null`  | Polls the script to check its exit code. If exit code is zero, the module is shown. For other codes, it is hidden. |
+| `on_click_left`   | `Script [oneshot]` | `null`  | Runs the script when the module is left clicked.                                                                   |
+| `on_click_middle` | `Script [oneshot]` | `null`  | Runs the script when the module is middle clicked.                                                                 |
+| `on_click_right`  | `Script [oneshot]` | `null`  | Runs the script when the module is right clicked.                                                                  |
+| `on_scroll_up`    | `Script [oneshot]` | `null`  | Runs the script when the module is scroll up on.                                                                   |
+| `on_scroll_down`  | `Script [oneshot]` | `null`  | Runs the script when the module is scrolled down on.                                                               |
+| `tooltip`         | `string`           | `null`  | Shows this text on hover. Supports embedding scripts between `{{double braces}}`.                                  |
--- a/docs/Images.md
+++ b/docs/Images.md
@@ -0,0 +1,15 @@
+Ironbar is capable of loading images from multiple sources. 
+In any situation where an option takes text or an icon, 
+you can use a string in any of the following formats, and it will automatically be detected as an image:
+
+| Source                        | Example                         |
+|-------------------------------|---------------------------------|
+| GTK icon theme                | `icon:firefox`                  |
+| Local file                    | `file:///path/to/file.jpg`      |
+| Remote file (over HTTP/HTTPS) | `https://example.com/image.jpg` |
+
+Remote images are loaded asynchronously to avoid blocking the UI thread. 
+Be aware this can cause elements to change size upon load if the image is large enough.
+
+Note that mixing text and images is not supported. 
+Your best option here is to use Nerd Font icons instead.
--- a/docs/Scripts.md
+++ b/docs/Scripts.md
@@ -3,13 +3,16 @@ that allow script input to dynamically set values.

 Scripts are passed to `sh -c`.

-Two types of scripts exist: polling and watching:
+Three types of scripts exist: polling, oneshot and watching:

- Polling scripts will run and wait for exit.
+- **Polling** scripts will run and wait for exit.
  Normally they will repeat this at an interval, hence the name, although in some cases they may only run on a user
  event.
  If the script exited code 0, the `stdout` will be used. Otherwise, `stderr` will be printed to the log.
- Watching scripts start a long-running process. Every time the process writes to `stdout`, the last line is captured
+- **Oneshot** scripts are a variant of polling scripts. 
+  They wait for script to exit, and may do something with the output, but are only fired by user events instead of the interval.
+  Generally options that accept oneshot scripts do not support the other types.
+- **Watching** scripts start a long-running process. Every time the process writes to `stdout`, the last line is captured
  and used.

 One should prefer to use watch-mode where possible, as it removes the overhead of regularly spawning processes.
@@ -28,6 +31,8 @@ spawning the script.
 Both `mode` and `interval` are optional and can be excluded to fall back to their defaults of `poll` and `5000`
 respectively.

+For oneshot scripts, both the mode and interval are ignored.
+
 ### Shorthand (string)

 Shorthand scripts should be written in the format:
--- a/docs/_Sidebar.md
+++ b/docs/_Sidebar.md
@@ -1,13 +1,15 @@
 # Guides

+- [Compiling from source](compiling)
 - [Configuration guide](configuration-guide)
  - [Scripts](scripts)
+  - [Images](images)
 - [Styling guide](styling-guide)

 # Examples

 - [Config](config)
- [Stylesheet](stylesheet)
+- [Stylesheet](https://github.com/JakeStanger/ironbar/blob/master/examples/style.css)

 ## Custom

@@ -15,11 +17,12 @@

 # Modules

+- [Clipboard](clipboard)
 - [Clock](clock)
 - [Custom](custom)
 - [Focused](focused)
 - [Launcher](launcher)
- [MPD](mpd)
+- [Music](music)
 - [Script](script)
 - [Sys_Info](sys-info)
 - [Tray](tray)
--- a/docs/_imgs/custom-power-menu.png
+++ b/docs/_imgs/custom-power-menu.png
--- a/docs/examples/Config.md
+++ b/docs/examples/Config.md
@@ -1,202 +1,10 @@
-The below config shows a module of each type being used.
+The configs linked below show a module of each type being used.

 The Corn format makes heavy use of variables 
 to show how module configs can be easily referenced to improve readability 
 and reduce config length when using multiple bars.

-<details>
-<summary>JSON</summary>
-
-```json
-{
-  "start": [
-    {
-      "all_monitors": false,
-      "name_map": {
-        "1": "ﭮ",
-        "2": "",
-        "3": "",
-        "Code": "",
-        "Games": ""
-      },
-      "type": "workspaces"
-    },
-    {
-      "favorites": [
-        "firefox",
-        "discord",
-        "Steam"
-      ],
-      "icon_theme": "Paper",
-      "show_icons": true,
-      "show_names": false,
-      "type": "launcher"
-    }
-  ],
-  "end": [
-    {
-      "music_dir": "/home/jake/Music",
-      "type": "mpd"
-    },
-    {
-      "host": "chloe:6600",
-      "type": "mpd"
-    },
-    {
-      "path": "/home/jake/bin/phone-battery",
-      "type": "script"
-    },
-    {
-      "format": [
-        "{cpu-percent}% ",
-        "{memory-percent}% "
-      ],
-      "type": "sys-info"
-    },
-    {
-      "type": "clock"
-    }
-  ]
-}
-```
-
-</details>
-
-<details>
-<summary>TOML</summary>
-
-```toml
-[[start]]
-all_monitors = false
-type = 'workspaces'
-
-[start.name_map]
-1 = 'ﭮ'
-2 = ''
-3 = ''
-Code = ''
-Games = ''
-
-[[start]]
-icon_theme = 'Paper'
-show_icons = true
-show_names = false
-type = 'launcher'
-favorites = [
-    'firefox',
-    'discord',
-    'Steam',
-]
-
-[[end]]
-music_dir = '/home/jake/Music'
-type = 'mpd'
-
-[[end]]
-host = 'chloe:6600'
-type = 'mpd'
-
-[[end]]
-path = '/home/jake/bin/phone-battery'
-type = 'script'
-
-[[end]]
-type = 'sys-info'
-format = [
-    '{cpu-percent}% ',
-    '{memory-percent}% ',
-]
-
-[[end]]
-type = 'clock'
-```
-
-</details>
-
-<details>
-<summary>YAML</summary>
-
-```yaml
---
-start:
-  - all_monitors: false
-    name_map:
-      "1": ﭮ
-      "2": 
-      "3": 
-      Code: 
-      Games: 
-    type: workspaces
-  - favorites:
-      - firefox
-      - discord
-      - Steam
-    icon_theme: Paper
-    show_icons: true
-    show_names: false
-    type: launcher
-end:
-  - music_dir: /home/jake/Music
-    type: mpd
-  - host: "chloe:6600"
-    type: mpd
-  - path: /home/jake/bin/phone-battery
-    type: script
-  - format:
-      - "{cpu-percent}% "
-      - "{memory-percent}% "
-    type: sys-info
-  - type: clock
-```
-</details>
-
-<details>
-<summary>Corn</summary>
-
-```corn
-let {
-    $workspaces = {
-        type = "workspaces"
-        all_monitors = false
-        name_map = {
-            1 = "ﭮ"
-            2 = ""
-            3 = ""
-            Games = ""
-            Code = ""
-        }
-    }
-
-    $launcher = {
-        type = "launcher"
-        favorites = ["firefox" "discord" "Steam"]
-        show_names = false
-        show_icons = true
-        icon_theme = "Paper"
-    }
-
-    $mpd_local = { type = "mpd" music_dir = "/home/jake/Music" }
-    $mpd_server = { type = "mpd" host = "chloe:6600" }
-
-    $sys_info = {
-        type = "sys-info"
-        format = ["{cpu-percent}% " "{memory-percent}% "]
-    }
-
-    $tray = { type = "tray" }
-    $clock = { type = "clock" }
-    
-    $phone_battery = {
-    type = "script"
-    path = "/home/jake/bin/phone-battery"
-    }
-    
-    $start = [ $workspaces $launcher ]
-    $end = [ $mpd_local $mpd_server $phone_battery $sys_info $clock ]
-}
-in {
-    start = $start
-    end = $end
-}
-```
-</details>
+- [JSON](https://github.com/JakeStanger/ironbar/blob/master/examples/config.json)
+- [TOML](https://github.com/JakeStanger/ironbar/blob/master/examples/config.toml)
+- [YAML](https://github.com/JakeStanger/ironbar/blob/master/examples/config.yaml)
+- [Corn](https://github.com/JakeStanger/ironbar/blob/master/examples/config.corn)
--- a/docs/examples/Stylesheet.md
+++ b/docs/examples/Stylesheet.md
@@ -1,142 +0,0 @@
-The below example is a full stylesheet for all modules:
-
-```css
-* {
-    /* a nerd font is required to be installed for icons */
-    font-family: Noto Sans Nerd Font, sans-serif;
-    font-size: 16px;
-    border: none;
-}
-
-#bar {
-    border-top: 1px solid #424242;
-}
-
-.container {
-    background-color: #2d2d2d;
-}
-
-.container#end > * + * {
-    margin-left: 20px;
-}
-
-.popup {
-    background-color: #2d2d2d;
-    border: 1px solid #424242;
-}
-
-#workspaces .item {
-    color: white;
-    background-color: #2d2d2d;
-    border-radius: 0;
-}
-
-#workspaces .item.focused {
-    box-shadow: inset 0 -3px;
-    background-color: #1c1c1c;
-}
-
-#workspaces *:not(.focused):hover {
-    box-shadow: inset 0 -3px;
-}
-
-#launcher .item {
-    border-radius: 0;
-    background-color: #2d2d2d;
-    margin-right: 4px;
-}
-
-#launcher .item:not(.focused):hover {
-    background-color: #1c1c1c;
-}
-
-#launcher .open {
-    border-bottom: 2px solid #6699cc;
-}
-
-#launcher .focused {
-    color: white;
-    background-color: black;
-    border-bottom: 4px solid #6699cc;
-}
-
-#launcher .urgent {
-    color: white;
-    background-color: #8f0a0a;
-}
-
-#script {
-    color: white;
-}
-
-#sysinfo {
-    color: white;
-}
-
-#tray .item {
-    background-color: #2d2d2d;
-}
-
-#mpd {
-    background-color: #2d2d2d;
-    color: white;
-}
-
-#popup-mpd {
-    color: white;
-    padding: 1em;
-}
-
-#popup-mpd #album-art {
-    margin-right: 1em;
-}
-
-#popup-mpd #title .icon, #popup-mpd #title .label {
-    font-size: 1.7em;
-}
-
-#popup-mpd #controls * {
-    border-radius: 0;
-    background-color: #2d2d2d;
-    color: white;
-}
-
-#popup-mpd #controls *:disabled {
-    color: #424242;
-}
-
-#clock {
-    color: white;
-    background-color: #2d2d2d;
-    font-weight: bold;
-}
-
-#popup-clock {
-    padding: 1em;
-}
-
-#popup-clock #calendar-clock {
-    color: white;
-    font-size: 2.5em;
-    padding-bottom: 0.1em;
-}
-
-#popup-clock #calendar {
-    background-color: #2d2d2d;
-    color: white;
-}
-
-#popup-clock #calendar .header {
-    padding-top: 1em;
-    border-top: 1px solid #424242;
-    font-size: 1.5em;
-}
-
-#popup-clock #calendar:selected {
-    background-color: #6699cc;
-}
-
-#focused {
-    color: white;
-}
-```
--- a/docs/examples/custom/Power-Menu.md
+++ b/docs/examples/custom/Power-Menu.md
@@ -1,6 +1,6 @@
 Creates a button on the bar, which opens a popup. The popup contains a header, shutdown button, restart button, and uptime.

-![A screenshot of the custom power menu module open, with some other modules present on the bar](../../_imgs/custom-power-menu.png)
+![A screenshot of the custom power menu module open, with some other modules present on the bar](https://f.jstanger.dev/github/ironbar/custom-power-menu.png)

 ## Configuration

@@ -16,9 +16,9 @@ Creates a button on the bar, which opens a popup. The popup contains a header, s
    {
      "bar": [
        {
-          "on_click": "popup:toggle",
          "label": "",
          "name": "power-btn",
+          "on_click": "popup:toggle",
          "type": "button"
        }
      ],
@@ -38,26 +38,27 @@ Creates a button on the bar, which opens a popup. The popup contains a header, s
              "widgets": [
                {
                  "class": "power-btn",
-                  "on_click": "!shutdown now",
                  "label": "<span font-size='40pt'></span>",
+                  "on_click": "!shutdown now",
                  "type": "button"
                },
                {
                  "class": "power-btn",
-                  "on_click": "!reboot",
                  "label": "<span font-size='40pt'></span>",
+                  "on_click": "!reboot",
                  "type": "button"
                }
              ]
            },
            {
-              "label": "Up: {{30000:uptime -p | cut -d ' ' -f2-}}",
+              "label": "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}",
              "name": "uptime",
              "type": "label"
            }
          ]
        }
      ],
+      "tooltip": "Up: {{30000:uptime -p | cut -d ' ' -f2-}}",
      "type": "custom"
    }
  ]
@@ -75,12 +76,13 @@ type = 'clock'

 [[end]]
 class = 'power-menu'
+tooltip = '''Up: {{30000:uptime -p | cut -d ' ' -f2-}}'''
 type = 'custom'

 [[end.bar]]
-on_click = 'popup:toggle'
 label = ''
 name = 'power-btn'
+on_click = 'popup:toggle'
 type = 'button'

 [[end.popup]]
@@ -97,18 +99,18 @@ type = 'box'

 [[end.popup.widgets.widgets]]
 class = 'power-btn'
-on_click = '!shutdown now'
 label = '''<span font-size='40pt'></span>'''
+on_click = '!shutdown now'
 type = 'button'

 [[end.popup.widgets.widgets]]
 class = 'power-btn'
-on_click = '!reboot'
 label = '''<span font-size='40pt'></span>'''
+on_click = '!reboot'
 type = 'button'

 [[end.popup.widgets]]
-label = '''Up: {{30000:uptime -p | cut -d ' ' -f2-}}'''
+label = '''Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}'''
 name = 'uptime'
 type = 'label'
 ```
@@ -121,10 +123,11 @@ type = 'label'
 ```yaml
 end:
 - type: clock
+
 - bar:
-  - on_click: popup:toggle
-    label: 
+  - label: 
    name: power-btn
+    on_click: popup:toggle
    type: button
  class: power-menu
  popup:
@@ -137,16 +140,17 @@ end:
    - type: box
      widgets:
      - class: power-btn
-        on_click: '!shutdown now'
        label: <span font-size='40pt'></span>
+        on_click: '!shutdown now'
        type: button
      - class: power-btn
-        on_click: '!reboot'
        label: <span font-size='40pt'></span>
+        on_click: '!reboot'
        type: button
-    - label: 'Up: {{30000:uptime -p | cut -d '' '' -f2-}}'
+    - label: 'Uptime: {{30000:uptime -p | cut -d '' '' -f2-}}'
      name: uptime
      type: label
+  tooltip: 'Up: {{30000:uptime -p | cut -d '' '' -f2-}}'
  type: custom
 ```

@@ -157,30 +161,37 @@ end:

 ```corn
 let {
+    $button = { type = "button" name="power-btn" label = "" on_click = "popup:toggle" }
+
+    $popup = {
+        type = "box"
+        orientation = "vertical"
+        widgets = [
+            { type = "label" name = "header" label = "Power menu" }
+            {
+                type = "box"
+                widgets = [
+                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
+                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
+                ]
+            }
+            { type = "label" name = "uptime" label = "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}" }
+        ]
+    }
+
    $power_menu = {
        type = "custom"
        class = "power-menu"

-        bar = [ { type = "button" name="power-btn" label = "" on_click = "popup:toggle" } ]
+        bar = [ $button ]
+        popup = [ $popup ]

-        popup = [ {
-            type = "box"
-            orientation = "vertical"
-            widgets = [
-                { type = "label" name = "header" label = "Power menu" }
-                {
-                    type = "box"
-                    widgets = [
-                        { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
-                        { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
-                    ]
-                }
-                { type = "label" name = "uptime" label = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}" }
-            ]
-        } ]
+        tooltip = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}"
    }
+    
+    $clock = { type = "clock" }
 } in {
-    end = [ $power_menu ]
+    end = [ $power_menu $clock ]
 }
 ```
 </details>
--- a/docs/modules/Clipboard.md
+++ b/docs/modules/Clipboard.md
@@ -0,0 +1,93 @@
+Shows recent clipboard items, allowing you to switch between them to re-copy previous values.
+Clicking the icon button opens the popup containing all functionality.
+
+Supports plain text and images.
+
+![Screenshot of clipboard popup open, with two textual values and an image copied. Several other unrelated widgets are visible on the bar.](https://f.jstanger.dev/github/ironbar/clipboard.png?raw)
+
+## Configuration
+
+> Type: `clipboard`
+
+| Name                  | Type                                  | Default | Description                                                                                                                                           |
+|-----------------------|---------------------------------------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `icon`                | `string/image`                        | `󰨸`    | Icon to show on the widget button.                                                                                                                    |
+| `max_items`           | `integer`                             | `10`    | Maximum number of items to show in the popup.                                                                                                         |
+| `truncate`            | `start` or `middle` or `end` or `Map` | `null`  | The location of the ellipses and where to truncate text from. Leave null to avoid truncating. Use the long-hand `Map` version if specifying a length. |
+| `truncate.mode`       | `start` or `middle` or `end`          | `null`  | The location of the ellipses and where to truncate text from. Leave null to avoid truncating.                                                         |
+| `truncate.length`     | `integer`                             | `null`  | The fixed width (in chars) of the widget. Leave blank to let GTK automatically handle.                                                                |
+| `truncate.max_length` | `integer`                             | `null`  | The maximum number of characters before truncating. Leave blank to let GTK automatically handle.                                                      |
+
+See [here](images) for information on images.
+
+<details>
+<summary>JSON</summary>
+
+```json
+{
+  "end": {
+    "type": "clipboard",
+    "max_items": 3,
+    "truncate": {
+      "mode": "end",
+      "length": 50
+    }
+  }
+}
+```
+</details>
+
+<details>
+<summary>TOML</summary>
+
+```toml
+[[end]]
+type = "clipboard"
+max_items = 3
+
+[[end.truncate]]
+mode = "end"
+length = 50
+```
+</details>
+
+<details>
+<summary>YAML</summary>
+
+```yaml
+end:
+  - type: 'clipboard'
+    max_items: 3
+    truncate:
+      mode: 'end'
+      length: 50
+```
+</details>
+
+<details>
+<summary>Corn</summary>
+
+```corn
+{
+    end = [ { 
+        type = "clipboard" 
+        max_items = 3 
+        truncate.mode = "end" 
+        truncate.length = 50 
+    } ] 
+}
+```
+</details>
+
+## Styling
+
+| Selector                             | Description                                          |
+|--------------------------------------|------------------------------------------------------|
+| `#clipboard`                         | Clipboard widget.                                    |
+| `#clipboard .btn`                    | Clipboard widget button.                             |
+| `#popup-clipboard`                   | Clipboard popup box.                                 |
+| `#popup-clipboard .item`             | Clipboard row item inside the popup.                 |
+| `#popup-clipboard .item .btn`        | Clipboard row item radio button.                     |
+| `#popup-clipboard .item .btn.text`   | Clipboard row item radio button (text values only).  |
+| `#popup-clipboard .item .btn.image`  | Clipboard row item radio button (image values only). |
+| `#popup-clipboard .item .btn-remove` | Clipboard row item remove button.                    |
--- a/docs/modules/Clock.md
+++ b/docs/modules/Clock.md
@@ -8,8 +8,8 @@ Clicking on the widget opens a popup with the time and a calendar.

 > Type: `clock`

-| Name     | Type   | Default          | Description                                                                                                                                |
-|----------|--------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------|
+| Name     | Type     | Default          | Description                                                                                                                              |
+|----------|----------|------------------|------------------------------------------------------------------------------------------------------------------------------------------|
 | `format` | `string` | `%d/%m/%Y %H:%M` | Date/time format string. Detail on available tokens can be found here: <https://docs.rs/chrono/latest/chrono/format/strftime/index.html> |

 <details>
@@ -69,9 +69,9 @@ end:

 ## Styling

-| Selector                      | Description                                                                        |
-|-------------------------------|------------------------------------------------------------------------------------|
-| `#clock`                      | Clock widget button                                                                |
-| `#popup-clock`                | Clock popup box                                                                    |
+| Selector                       | Description                                                                        |
+|--------------------------------|------------------------------------------------------------------------------------|
+| `#clock`                       | Clock widget button                                                                |
+| `#popup-clock`                 | Clock popup box                                                                    |
 | `#popup-clock #calendar-clock` | Clock inside the popup                                                             |
 | `#popup-clock #calendar`       | Calendar widget inside the popup. GTK provides some OOTB styling options for this. |
--- a/docs/modules/Custom.md
+++ b/docs/modules/Custom.md
@@ -1,7 +1,7 @@
 Allows you to compose custom modules consisting of multiple widgets, including popups. 
 Labels can display dynamic content from scripts, and buttons can interact with the bar or execute commands on click.

-![Custom module with a button on the bar, and the popup open. The popup contains a header, shutdown button and restart button.](https://user-images.githubusercontent.com/5057870/196058785-042ef171-7e77-4d5c-921a-eca03c6424bd.png)
+![Custom module with a button on the bar, and the popup open. The popup contains a header, shutdown button and restart button.](https://f.jstanger.dev/github/ironbar/custom-power-menu.png)

 ## Configuration

@@ -18,15 +18,17 @@ It is well worth looking at the examples.

 ### `Widget`

-| Name          | Type                         | Default      | Description                                                               |
-|---------------|------------------------------|--------------|---------------------------------------------------------------------------|
-| `widget_type` | `box` or `label` or `button` | `null`       | Type of GTK widget to create.                                             |
-| `name`        | `string`                     | `null`       | Widget name.                                                              |
-| `class`       | `string`                     | `null`       | Widget class name.                                                        |
-| `label`       | `string`                     | `null`       | [`label` and `button`] Widget text label. Pango markup supported.         |
-| `on_click`    | `string`                     | `null`       | [`button`] Command to execute. More on this [below](#commands).           |
-| `orientation` | `horizontal` or `vertical`   | `horizontal` | [`box`] Whether child widgets should be horizontally or vertically added. |
-| `widgets`     | `Widget[]`                   | `[]`         | [`box`] List of widgets to add to this box.                               |
+| Name          | Type                                    | Default      | Description                                                               |
+|---------------|-----------------------------------------|--------------|---------------------------------------------------------------------------|
+| `widget_type` | `box` or `label` or `button` or `image` | `null`       | Type of GTK widget to create.                                             |
+| `name`        | `string`                                | `null`       | Widget name.                                                              |
+| `class`       | `string`                                | `null`       | Widget class name.                                                        |
+| `label`       | `string`                                | `null`       | [`label` and `button`] Widget text label. Pango markup supported.         |
+| `on_click`    | `string`                                | `null`       | [`button`] Command to execute. More on this [below](#commands).           |
+| `src`         | `image`                                 | `null`       | [`image`] Image source. See [here](images) for information on images.     |
+| `size`        | `integer`                               | `null`       | [`image`] Width/height of the image. Aspect ratio is preserved.           |
+| `orientation` | `horizontal` or `vertical`              | `horizontal` | [`box`] Whether child widgets should be horizontally or vertically added. |
+| `widgets`     | `Widget[]`                              | `[]`         | [`box`] List of widgets to add to this box.                               |

 ### Labels

@@ -39,7 +41,7 @@ For example, the following label would output your system uptime, updated every
 Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}
 ```

-Both polling and watching mode are supported. For more information on script syntax, see [here](script).
+Both polling and watching mode are supported. For more information on script syntax, see [here](scripts).

 ### Commands

@@ -56,6 +58,8 @@ The following bar commands are supported:
 - `popup:open`
 - `popup:close`

+---
+
 XML is arguably better-suited and easier to read for this sort of markup, 
 but currently is not supported.
 Nonetheless, it may be worth comparing the examples to the below equivalent
--- a/docs/modules/Focused.md
+++ b/docs/modules/Focused.md
@@ -7,12 +7,15 @@ Displays the title and/or icon of the currently focused window.

 > Type: `focused`

-| Name         | Type      | Default | Description                     |
-|--------------|-----------|---------|---------------------------------|
-| `show_icon`  | `boolean` | `true`  | Whether to show the app's icon  |
-| `show_title` | `boolean` | `true`  | Whether to show the app's title |
-| `icon_size`  | `integer` | `32`    | Size of icon in pixels          |
-| `icon_theme` | `string`  | `null`  | GTK icon theme to use           |
+| Name                  | Type                                  | Default | Description                                                                                                                                           |
+|-----------------------|---------------------------------------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `show_icon`           | `boolean`                             | `true`  | Whether to show the app's icon                                                                                                                        |
+| `show_title`          | `boolean`                             | `true`  | Whether to show the app's title                                                                                                                       |
+| `icon_size`           | `integer`                             | `32`    | Size of icon in pixels                                                                                                                                |
+| `truncate`            | `start` or `middle` or `end` or `Map` | `null`  | The location of the ellipses and where to truncate text from. Leave null to avoid truncating. Use the long-hand `Map` version if specifying a length. |
+| `truncate.mode`       | `start` or `middle` or `end`          | `null`  | The location of the ellipses and where to truncate text from. Leave null to avoid truncating.                                                         |
+| `truncate.length`     | `integer`                             | `null`  | The fixed width (in chars) of the widget. Leave blank to let GTK automatically handle.                                                                |
+| `truncate.max_length` | `integer`                             | `null`  | The maximum number of characters before truncating. Leave blank to let GTK automatically handle.                                                      |

 <details>
 <summary>JSON</summary>
@@ -25,7 +28,7 @@ Displays the title and/or icon of the currently focused window.
      "show_icon": true,
      "show_title": true,
      "icon_size": 32,
-      "icon_theme": "Paper"
+      "truncate": "end"
    }
  ]
 }
@@ -43,7 +46,7 @@ type = "focused"
 show_icon = true
 show_title = true
 icon_size = 32
-icon_theme = "Paper"
+truncate = "end"
 ```

 </details>
@@ -57,7 +60,7 @@ end:
    show_icon: true
    show_title: true
    icon_size: 32
-    icon_theme: "Paper"
+    truncate: "end"
 ```

 </details>
@@ -73,7 +76,7 @@ end:
      show_icon = true
      show_title = true
      icon_size = 32
-      icon_theme = "Paper"
+      truncate = "end"
    }
  ]
 }
--- a/docs/modules/Launcher.md
+++ b/docs/modules/Launcher.md
@@ -3,7 +3,7 @@ Hovering over a program with multiple windows open shows a popup with each windo
 Clicking an icon/popup item focuses or launches the program.
 Optionally displays a launchable set of favourites.

-![Screenshot showing several open applications, including a focused terminal.](https://user-images.githubusercontent.com/5057870/184540058-120e190e-2a45-4167-99c7-ed76482d1f16.png)
+![Screenshot showing several open applications, including a popup showing multiple terminal windows.](https://f.jstanger.dev/github/ironbar/launcher.png)

 ## Configuration

@@ -14,7 +14,6 @@ Optionally displays a launchable set of favourites.
 | `favorites`  | `string[]` | `[]`    | List of app IDs (or classes) to always show at the start of the launcher                            |
 | `show_names` | `boolean`  | `false` | Whether to show app names on the button label. Names will still show on tooltips when set to false. |
 | `show_icons` | `boolean`  | `true`  | Whether to show app icons on the button.                                                            |
-| `icon_theme` | `string`   | `null`  | GTK icon theme to use.                                                                              |

 <details>
 <summary>JSON</summary>
@@ -29,8 +28,7 @@ Optionally displays a launchable set of favourites.
        "discord"
      ],
      "show_names": false,
-      "show_icons": true,
-      "icon_theme": "Paper"
+      "show_icons": true
    }
  ]
 }
@@ -49,7 +47,6 @@ type = "launcher"
 favorites = ["firefox", "discord"]
 show_names = false
 show_icons = true
-icon_theme = "Paper"
 ```

 </details>
@@ -65,7 +62,6 @@ start:
      - discord
    show_names: false
    show_icons: true
-    icon_theme: "Paper"
 ```

 </details>
@@ -78,10 +74,9 @@ start:
  start = [
    {
      type = "launcher"
-      favorites = ["firefox" "discord"]
+      favorites = [ "firefox" "discord" ]
      show_names = false
      show_icons = true
-      icon_theme = "Paper"

    }
  ]
--- a/docs/modules/MPD.md
+++ b/docs/modules/MPD.md
@@ -1,131 +0,0 @@
-Displays currently playing song from MPD.
-Clicking on the widget opens a popout displaying info about the current song, album art
-and playback controls.
-
-![Screenshot showing MPD widget with track playing with popout open](https://user-images.githubusercontent.com/5057870/184539664-a8f3ad5b-69c0-492d-a27d-82303c09a347.png)
-
-## Configuration
-
-> Type: `mpd`
-
-|                | Type     | Default                     | Description                                                           |
-|----------------|----------|-----------------------------|-----------------------------------------------------------------------|
-| `host`         | `string` | `localhost:6600`            | TCP or Unix socket for the MPD server.                                |
-| `format`       | `string` | `{icon} {title} / {artist}` | Format string for the widget. More info below.                        |
-| `icons.play`   | `string` | ``                         | Icon to show when playing.                                            |
-| `icons.pause`  | `string` | ``                         | Icon to show when paused.                                             |
-| `icons.volume` | `string` | `墳`                         | Icon to show under popup volume slider.                               |
-| `music_dir`    | `string` | `$HOME/Music`               | Path to MPD server's music directory on disc. Required for album art. |
-
-<details>
-<summary>JSON</summary>
-
-```json
-{
-  "start": [
-    {
-      "type": "mpd",
-      "format": "{icon} {title} / {artist}",
-      "icons": {
-        "play": "",
-        "pause": ""
-      },
-      "music_dir": "/home/jake/Music"
-    }
-  ]
-}
-```
-
-</details>
-
-<details>
-<summary>TOML</summary>
-
-```toml
-[[start]]
-type = "mpd"
-format = "{icon} {title} / {artist}"
-music_dir = "/home/jake/Music"
-
-[[start.icons]]
-play = ""
-pause = ""
-```
-
-</details>
-
-<details>
-<summary>YAML</summary>
-
-```yaml
-start:
-  - type: "mpd"
-    format: "{icon} {title} / {artist}"
-    icons:
-      play: ""
-      pause: ""
-    music_dir: "/home/jake/Music"
-```
-
-</details>
-
-<details>
-<summary>Corn</summary>
-
-```corn
-{
-  start = [
-    {
-      type = "mpd"
-      format = "{icon} {title} / {artist}"
-      icons.play = ""
-      icons.pause = ""
-      music_dir = "/home/jake/Music"
-    }
-  ]
-}
-```
-
-</details>
-
-### Formatting Tokens
-
-The following tokens can be used in the `format` config option,
-and will be replaced with values from the currently playing track:
-
-| Token        | Description                          |
-|--------------|--------------------------------------|
-| `{icon}`     | Either `icons.play` or `icons.pause` |
-| `{title}`    | Title                                |
-| `{album}`    | Album name                           |
-| `{artist}`   | Artist name                          |
-| `{date}`     | Release date                         |
-| `{track}`    | Track number                         |
-| `{disc}`     | Disc number                          |
-| `{genre}`    | Genre                                |
-| `{duration}` | Duration in `mm:ss`                  |
-| `{elapsed}`  | Time elapsed in `mm:ss`              |
-
-## Styling
-
-| Selector                               | Description                              |
-|----------------------------------------|------------------------------------------|
-| `#mpd`                                 | Tray widget button                       |
-| `#popup-mpd`                           | Popup box                                |
-| `#popup-mpd #album-art`                | Album art image inside popup box         |
-| `#popup-mpd #title`                    | Track title container inside popup box   |
-| `#popup-mpd #title .icon`              | Track title icon label inside popup box  |
-| `#popup-mpd #title .label`             | Track title label inside popup box       |
-| `#popup-mpd #album`                    | Track album container inside popup box   |
-| `#popup-mpd #album .icon`              | Track album icon label inside popup box  |
-| `#popup-mpd #album .label`             | Track album label inside popup box       |
-| `#popup-mpd #artist`                   | Track artist container inside popup box  |
-| `#popup-mpd #artist .icon`             | Track artist icon label inside popup box |
-| `#popup-mpd #artist .label`            | Track artist label inside popup box      |
-| `#popup-mpd #controls`                 | Controls container inside popup box      |
-| `#popup-mpd #controls #btn-prev`       | Previous button inside popup box         |
-| `#popup-mpd #controls #btn-play-pause` | Play/pause button inside popup box       |
-| `#popup-mpd #controls #btn-next`       | Next button inside popup box             |
-| `#popup-mpd #volume`                   | Volume container inside popup box        |
-| `#popup-mpd #volume #slider`           | Volume slider popup box                  |
-| `#popup-mpd #volume .icon`             | Volume icon label inside popup box       |
--- a/docs/modules/Music.md
+++ b/docs/modules/Music.md
@@ -0,0 +1,154 @@
+Displays currently playing song from your music player.
+This module supports both MPRIS players and MPD servers.
+Clicking on the widget opens a popout displaying info about the current song, album art
+and playback controls.
+
+in MPRIS mode, the widget will listen to all players and automatically detect/display the active one.
+
+![Screenshot showing MPD widget with track playing with popout open](https://f.jstanger.dev/github/ironbar/music.png)
+
+## Configuration
+
+> Type: `music`
+
+|                       | Type                                  | Default              | Description                                                                                                                                           |
+|-----------------------|---------------------------------------|----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `player_type`         | `mpris` or `mpd`                      | `mpris`              | Whether to connect to MPRIS players or an MPD server.                                                                                                 |
+| `format`              | `string`                              | `{title} / {artist}` | Format string for the widget. More info below.                                                                                                        |
+| `truncate`            | `start` or `middle` or `end` or `Map` | `null`               | The location of the ellipses and where to truncate text from. Leave null to avoid truncating. Use the long-hand `Map` version if specifying a length. |
+| `truncate.mode`       | `start` or `middle` or `end`          | `null`               | The location of the ellipses and where to truncate text from. Leave null to avoid truncating.                                                         |
+| `truncate.length`     | `integer`                             | `null`               | The fixed width (in chars) of the widget. Leave blank to let GTK automatically handle.                                                                |
+| `truncate.max_length` | `integer`                             | `null`               | The maximum number of characters before truncating. Leave blank to let GTK automatically handle.                                                      |
+| `icons.play`          | `string/image`                        | ``                  | Icon to show when playing.                                                                                                                            |
+| `icons.pause`         | `string/image`                        | ``                  | Icon to show when paused.                                                                                                                             |
+| `icons.prev`          | `string/image`                        | `玲`                  | Icon to show on previous button.                                                                                                                      |
+| `icons.next`          | `string/image`                        | `怜`                  | Icon to show on next button.                                                                                                                          |
+| `icons.volume`        | `string/image`                        | `墳`                  | Icon to show under popup volume slider.                                                                                                               |
+| `icons.track`         | `string/image`                        | ``                  | Icon to show next to track title.                                                                                                                     |
+| `icons.album`         | `string/image`                        | ``                  | Icon to show next to album name.                                                                                                                      |
+| `icons.artist`        | `string/image`                        | `ﴁ`                  | Icon to show next to artist name.                                                                                                                     |
+| `host`                | `string/image`                        | `localhost:6600`     | [MPD Only] TCP or Unix socket for the MPD server.                                                                                                     |
+| `music_dir`           | `string/image`                        | `$HOME/Music`        | [MPD Only] Path to MPD server's music directory on disc. Required for album art.                                                                      |
+
+See [here](images) for information on images.
+
+<details>
+<summary>JSON</summary>
+
+```json
+{
+  "start": [
+    {
+      "type": "music",
+      "player_type": "mpd",
+      "format": "{title} / {artist}",
+      "truncate": "end",
+      "icons": {
+        "play": "",
+        "pause": ""
+      },
+      "music_dir": "/home/jake/Music"
+    }
+  ]
+}
+```
+
+</details>
+
+<details>
+<summary>TOML</summary>
+
+```toml
+[[start]]
+type = "music"
+player_type = "mpd"
+format = "{title} / {artist}"
+music_dir = "/home/jake/Music"
+truncate = "end"
+
+[[start.icons]]
+play = ""
+pause = ""
+```
+
+</details>
+
+<details>
+<summary>YAML</summary>
+
+```yaml
+start:
+  - type: "music"
+    player_type: "mpd"
+    format: "{title} / {artist}"
+    truncate: "end"
+    icons:
+      play: ""
+      pause: ""
+    music_dir: "/home/jake/Music"
+```
+
+</details>
+
+<details>
+<summary>Corn</summary>
+
+```corn
+{
+  start = [
+    {
+      type = "music"
+      player_type = "mpd"
+      format = "{title} / {artist}"
+      truncate = "end"
+      icons.play = ""
+      icons.pause = ""
+      music_dir = "/home/jake/Music"
+    }
+  ]
+}
+```
+
+</details>
+
+### Formatting Tokens
+
+The following tokens can be used in the `format` config option,
+and will be replaced with values from the currently playing track:
+
+| Token        | Description                          |
+|--------------|--------------------------------------|
+| `{title}`    | Title                                |
+| `{album}`    | Album name                           |
+| `{artist}`   | Artist name                          |
+| `{date}`     | Release date                         |
+| `{track}`    | Track number                         |
+| `{disc}`     | Disc number                          |
+| `{genre}`    | Genre                                |
+| `{duration}` | Duration in `mm:ss`                  |
+| `{elapsed}`  | Time elapsed in `mm:ss`              |
+
+## Styling
+
+| Selector                            | Description                              |
+|-------------------------------------|------------------------------------------|
+| `#music`                            | Tray widget button                       |
+| `#popup-music`                      | Popup box                                |
+| `#popup-music #album-art`           | Album art image inside popup box         |
+| `#popup-music #title`               | Track title container inside popup box   |
+| `#popup-music #title .icon`         | Track title icon label inside popup box  |
+| `#popup-music #title .label`        | Track title label inside popup box       |
+| `#popup-music #album`               | Track album container inside popup box   |
+| `#popup-music #album .icon`         | Track album icon label inside popup box  |
+| `#popup-music #album .label`        | Track album label inside popup box       |
+| `#popup-music #artist`              | Track artist container inside popup box  |
+| `#popup-music #artist .icon`        | Track artist icon label inside popup box |
+| `#popup-music #artist .label`       | Track artist label inside popup box      |
+| `#popup-music #controls`            | Controls container inside popup box      |
+| `#popup-music #controls #btn-prev`  | Previous button inside popup box         |
+| `#popup-music #controls #btn-play`  | Play button inside popup box             |
+| `#popup-music #controls #btn-pause` | Pause button inside popup box            |
+| `#popup-music #controls #btn-next`  | Next button inside popup box             |
+| `#popup-music #volume`              | Volume container inside popup box        |
+| `#popup-music #volume #slider`      | Volume slider popup box                  |
+| `#popup-music #volume .icon`        | Volume icon label inside popup box       |
--- a/docs/modules/Workspaces.md
+++ b/docs/modules/Workspaces.md
@@ -1,6 +1,6 @@
-> ⚠ **This module is currently only supported on Sway**
+> ⚠ **This module is currently only supported on Sway and Hyprland**

-Shows all current Sway workspaces. Clicking a workspace changes focus to it.
+Shows all current workspaces. Clicking a workspace changes focus to it.

 ![Screenshot showing workspaces widget using custom icons with browser workspace focused](https://user-images.githubusercontent.com/5057870/184540156-26cfe4ec-ab8d-4e0f-a883-8b641025366b.png)

@@ -8,10 +8,11 @@ Shows all current Sway workspaces. Clicking a workspace changes focus to it.

 > Type: `workspaces`

-| Name           | Type                  | Default | Description                                                                                                          |
-|----------------|-----------------------|---------|----------------------------------------------------------------------------------------------------------------------|
-| `name_map`     | `Map<string, string>` | `{}`    | A map of actual workspace names to their display labels. Workspaces use their actual name if not present in the map. |
-| `all_monitors` | `boolean`             | `false` | Whether to display workspaces from all monitors. When `false`, only shows workspaces on the current monitor.         |
+| Name           | Type                        | Default        | Description                                                                                                                                                               |
+|----------------|-----------------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `name_map`     | `Map<string, string/image>` | `{}`           | A map of actual workspace names to their display labels/images. Workspaces use their actual name if not present in the map. See [here](images) for information on images. |
+| `all_monitors` | `boolean`                   | `false`        | Whether to display workspaces from all monitors. When `false`, only shows workspaces on the current monitor.                                                              |
+| `sort`         | `added` or `alphanumeric`   | `alphanumeric` | The method used for sorting workspaces. `added` always appends to the end, `alphanumeric` sorts by number/name.                                                           |

 <details>
 <summary>JSON</summary>
@@ -71,15 +72,15 @@ end:

 ```corn
 {
-  end = [
-    {
-      type = "workspaces",
-      name_map.1 = ""
-      name_map.2 = ""
-      name_map.3 = ""
-      all_monitors = false
-    }
-  ]
+    end = [
+        {
+            type = "workspaces",
+            name_map.1 = ""
+            name_map.2 = ""
+            name_map.3 = ""
+            all_monitors = false
+        }
+    ]
 }
 ```

--- a/examples/config.corn
+++ b/examples/config.corn
@@ -4,78 +4,107 @@ let {
        all_monitors = false
        name_map = {
            1 = "ﭮ"
-            2 = ""
+            2 = "icon:firefox"
            3 = ""
-            Games = ""
+            Games = "icon:steam"
            Code = ""
        }
    }

+    $focused = { type = "focused" }
+
    $launcher = {
        type = "launcher"
        favorites = ["firefox" "discord" "Steam"]
        show_names = false
        show_icons = true
-        icon_theme = "Paper"
    }

-    $mpd_local = { type = "mpd" music_dir = "/home/jake/Music" }
-    $mpd_server = { type = "mpd" host = "chloe:6600" }
+    $mpris = {
+        type = "music"
+        player_type = "mpris"
+
+        on_click_middle = "playerctl play-pause"
+        on_scroll_up = "playerctl volume +5"
+        on_scroll_down = "playerctl volume -5"
+
+    }
+
+    $mpd_local = { type = "music" player_type = "mpd" music_dir = "/home/jake/Music" truncate.mode = "end" truncate.max_length = 100 }
+    $mpd_server = { type = "music" player_type = "mpd" host = "chloe:6600" truncate = "end" }

    $sys_info = {
        type = "sys_info"
-        format = ["{cpu_percent}% " "{memory_percent}% "]
+
+        interval.memory = 30
+        interval.cpu = 1
+        interval.temps = 5
+        interval.disks = 300
+        interval.networks = 3
+
+        format = [
+            " {cpu_percent}% | {temp_c:k10temp_Tccd1}°C"
+            " {memory_used} / {memory_total} GB ({memory_percent}%)"
+            "| {swap_used} / {swap_total} GB ({swap_percent}%)"
+            " {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)"
+            "李 {net_down:enp39s0} / {net_up:enp39s0} Mbps"
+            "猪 {load_average:1} | {load_average:5} | {load_average:15}"
+            " {uptime}"
+        ]
    }

    $tray = { type = "tray" }
-    $clock = {
-        type = "clock"
-        // show-if = "500:[ $(($(date +%s) % 2)) -eq 0 ]"
-        show_if.cmd = "exit 0"
-        show_if.interval = 500
-    }
+
+    $clock = { type = "clock" }

    $phone_battery = {
        type = "script"
        cmd = "/home/jake/bin/phone-battery"
+
+        show_if.cmd = "/home/jake/bin/phone-connected"
+        show_if.interval = 500
    }

-    $log_tail = {
-        type = "script"
-        path = "tail -f /home/jake/.local/share/ironbar/error.log"
-        mode = "watch"
+    $clipboard = { type = "clipboard" max_items = 3 truncate.mode = "end" truncate.length = 50 }
+
+    // -- begin custom --
+    $button = { type = "button" name="power-btn" label = "" on_click = "popup:toggle" }
+
+    $popup = {
+        type = "box"
+        orientation = "vertical"
+        widgets = [
+            { type = "label" name = "header" label = "Power menu" }
+            {
+                type = "box"
+                widgets = [
+                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
+                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
+                ]
+            }
+            { type = "label" name = "uptime" label = "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}" }
+        ]
    }

    $power_menu = {
        type = "custom"
        class = "power-menu"

-        bar = [ { type = "button" name="power-btn" label = "" on_click = "popup:toggle" } ]
-
-        popup = [ {
-            type = "box"
-            orientation = "vertical"
-            widgets = [
-                { type = "label" name = "header" label = "Power menu" }
-                {
-                    type = "box"
-                    widgets = [
-                        { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
-                        { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
-                    ]
-                }
-                { type = "label" name = "uptime" label = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}" }
-            ]
-        } ]
+        bar = [ $button ]
+        popup = [ $popup ]

        tooltip = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}"
    }
+    // -- end custom --

    $left = [ $workspaces $launcher ]
-    $right = [ $mpd_local $mpd_server $phone_battery $sys_info $power_menu $clock ]
+    $right = [ $mpd_local $mpd_server $phone_battery $sys_info $clipboard $power_menu $clock ]
 }
 in {
    anchor_to_edges = true
-    position = "top"
-    start = $left end = $right
+    position = "bottom"
+    icon_theme = "Paper"
+
+    start = $left
+    end = $right
 }
--- a/examples/config.json
+++ b/examples/config.json
@@ -1,43 +1,131 @@
 {
+  "anchor_to_edges": true,
+  "end": [
+    {
+      "music_dir": "/home/jake/Music",
+      "player_type": "mpd",
+      "truncate": {
+        "max_length": 100,
+        "mode": "end"
+      },
+      "type": "music"
+    },
+    {
+      "host": "chloe:6600",
+      "player_type": "mpd",
+      "truncate": "end",
+      "type": "music"
+    },
+    {
+      "cmd": "/home/jake/bin/phone-battery",
+      "show_if": {
+        "cmd": "/home/jake/bin/phone-connected",
+        "interval": 500
+      },
+      "type": "script"
+    },
+    {
+      "format": [
+        " {cpu_percent}% | {temp_c:k10temp_Tccd1}°C",
+        " {memory_used} / {memory_total} GB ({memory_percent}%)",
+        "| {swap_used} / {swap_total} GB ({swap_percent}%)",
+        " {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)",
+        "李 {net_down:enp39s0} / {net_up:enp39s0} Mbps",
+        "猪 {load_average:1} | {load_average:5} | {load_average:15}",
+        " {uptime}"
+      ],
+      "interval": {
+        "cpu": 1,
+        "disks": 300,
+        "memory": 30,
+        "networks": 3,
+        "temps": 5
+      },
+      "type": "sys_info"
+    },
+    {
+      "max_items": 3,
+      "truncate": {
+        "length": 50,
+        "mode": "end"
+      },
+      "type": "clipboard"
+    },
+    {
+      "bar": [
+        {
+          "label": "",
+          "name": "power-btn",
+          "on_click": "popup:toggle",
+          "type": "button"
+        }
+      ],
+      "class": "power-menu",
+      "popup": [
+        {
+          "orientation": "vertical",
+          "type": "box",
+          "widgets": [
+            {
+              "label": "Power menu",
+              "name": "header",
+              "type": "label"
+            },
+            {
+              "type": "box",
+              "widgets": [
+                {
+                  "class": "power-btn",
+                  "label": "<span font-size='40pt'></span>",
+                  "on_click": "!shutdown now",
+                  "type": "button"
+                },
+                {
+                  "class": "power-btn",
+                  "label": "<span font-size='40pt'></span>",
+                  "on_click": "!reboot",
+                  "type": "button"
+                }
+              ]
+            },
+            {
+              "label": "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}",
+              "name": "uptime",
+              "type": "label"
+            }
+          ]
+        }
+      ],
+      "tooltip": "Up: {{30000:uptime -p | cut -d ' ' -f2-}}",
+      "type": "custom"
+    },
+    {
+      "type": "clock"
+    }
+  ],
+  "icon_theme": "Paper",
+  "position": "bottom",
  "start": [
    {
+      "all_monitors": false,
+      "name_map": {
+        "1": "ﭮ",
+        "2": "icon:firefox",
+        "3": "",
+        "Code": "",
+        "Games": "icon:steam"
+      },
      "type": "workspaces"
    },
    {
-      "type": "launcher",
-      "icon_theme": "Paper",
      "favorites": [
        "firefox",
        "discord",
        "Steam"
      ],
-      "show_names": false
-    }
-  ],
-  "end": [
-    {
-      "type": "mpd"
-    },
-    {
-      "type": "mpd",
-      "host": "chloe:6600"
-    },
-    {
-      "path": "/home/jake/bin/phone-battery",
-      "type": "script"
-    },
-    {
-      "format": [
-        "{cpu_percent}% ",
-        "{memory_percent}% "
-      ],
-      "type": "sys_info"
-    },
-    {
-      "type": "tray"
-    },
-    {
-      "type": "clock"
+      "show_icons": true,
+      "show_names": false,
+      "type": "launcher"
    }
  ]
-}
+}
--- a/examples/config.toml
+++ b/examples/config.toml
@@ -0,0 +1,118 @@
+anchor_to_edges = true
+icon_theme = 'Paper'
+position = 'bottom'
+
+[[end]]
+music_dir = '/home/jake/Music'
+player_type = 'mpd'
+type = 'music'
+
+[end.truncate]
+max_length = 100
+mode = 'end'
+
+[[end]]
+host = 'chloe:6600'
+player_type = 'mpd'
+truncate = 'end'
+type = 'music'
+
+[[end]]
+cmd = '/home/jake/bin/phone-battery'
+type = 'script'
+
+[end.show_if]
+cmd = '/home/jake/bin/phone-connected'
+interval = 500
+
+[[end]]
+type = 'sys_info'
+format = [
+    ' {cpu_percent}% | {temp_c:k10temp_Tccd1}°C',
+    ' {memory_used} / {memory_total} GB ({memory_percent}%)',
+    '| {swap_used} / {swap_total} GB ({swap_percent}%)',
+    ' {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)',
+    '李 {net_down:enp39s0} / {net_up:enp39s0} Mbps',
+    '猪 {load_average:1} | {load_average:5} | {load_average:15}',
+    ' {uptime}',
+]
+
+[end.interval]
+cpu = 1
+disks = 300
+memory = 30
+networks = 3
+temps = 5
+
+[[end]]
+max_items = 3
+type = 'clipboard'
+
+[end.truncate]
+length = 50
+mode = 'end'
+
+[[end]]
+class = 'power-menu'
+tooltip = '''Up: {{30000:uptime -p | cut -d ' ' -f2-}}'''
+type = 'custom'
+
+[[end.bar]]
+label = ''
+name = 'power-btn'
+on_click = 'popup:toggle'
+type = 'button'
+
+[[end.popup]]
+orientation = 'vertical'
+type = 'box'
+
+[[end.popup.widgets]]
+label = 'Power menu'
+name = 'header'
+type = 'label'
+
+[[end.popup.widgets]]
+type = 'box'
+
+[[end.popup.widgets.widgets]]
+class = 'power-btn'
+label = '''<span font-size='40pt'></span>'''
+on_click = '!shutdown now'
+type = 'button'
+
+[[end.popup.widgets.widgets]]
+class = 'power-btn'
+label = '''<span font-size='40pt'></span>'''
+on_click = '!reboot'
+type = 'button'
+
+[[end.popup.widgets]]
+label = '''Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}'''
+name = 'uptime'
+type = 'label'
+
+[[end]]
+type = 'clock'
+
+[[start]]
+all_monitors = false
+type = 'workspaces'
+
+[start.name_map]
+1 = 'ﭮ'
+2 = 'icon:firefox'
+3 = ''
+Code = ''
+Games = 'icon:steam'
+
+[[start]]
+show_icons = true
+show_names = false
+type = 'launcher'
+favorites = [
+    'firefox',
+    'discord',
+    'Steam',
+]
+
--- a/examples/config.yaml
+++ b/examples/config.yaml
@@ -0,0 +1,85 @@
+anchor_to_edges: true
+end:
+  - music_dir: /home/jake/Music
+    player_type: mpd
+    truncate:
+      max_length: 100
+      mode: end
+    type: music
+  - host: chloe:6600
+    player_type: mpd
+    truncate: end
+    type: music
+  - cmd: /home/jake/bin/phone-battery
+    show_if:
+      cmd: /home/jake/bin/phone-connected
+      interval: 500
+    type: script
+  - format:
+      -  {cpu_percent}% | {temp_c:k10temp_Tccd1}°C
+      -  {memory_used} / {memory_total} GB ({memory_percent}%)
+      - '| {swap_used} / {swap_total} GB ({swap_percent}%)'
+      -  {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)
+      - 李 {net_down:enp39s0} / {net_up:enp39s0} Mbps
+      - 猪 {load_average:1} | {load_average:5} | {load_average:15}
+      -  {uptime}
+    interval:
+      cpu: 1
+      disks: 300
+      memory: 30
+      networks: 3
+      temps: 5
+    type: sys_info
+  - max_items: 3
+    truncate:
+      length: 50
+      mode: end
+    type: clipboard
+  - bar:
+      - label: 
+        name: power-btn
+        on_click: popup:toggle
+        type: button
+    class: power-menu
+    popup:
+      - orientation: vertical
+        type: box
+        widgets:
+          - label: Power menu
+            name: header
+            type: label
+          - type: box
+            widgets:
+              - class: power-btn
+                label: <span font-size='40pt'></span>
+                on_click: '!shutdown now'
+                type: button
+              - class: power-btn
+                label: <span font-size='40pt'></span>
+                on_click: '!reboot'
+                type: button
+          - label: 'Uptime: {{30000:uptime -p | cut -d '' '' -f2-}}'
+            name: uptime
+            type: label
+    tooltip: 'Up: {{30000:uptime -p | cut -d '' '' -f2-}}'
+    type: custom
+  - type: clock
+icon_theme: Paper
+position: bottom
+start:
+  - all_monitors: false
+    name_map:
+      '1': ﭮ
+      '2': icon:firefox
+      '3': 
+      Code: 
+      Games: icon:steam
+    type: workspaces
+  - favorites:
+      - firefox
+      - discord
+      - Steam
+    show_icons: true
+    show_names: false
+    type: launcher
+
--- a/examples/custom.corn
+++ b/examples/custom.corn
@@ -1,29 +0,0 @@
-let {
-    $button = { type = "button" name="power-btn" label = "" on_click = "popup:toggle" }
-
-    $popup = {
-        type = "box"
-        orientation = "vertical"
-        widgets = [
-            { type = "label" name = "header" label = "Power menu" }
-            {
-                type = "box"
-                widgets = [
-                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
-                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
-                ]
-            }
-            { type = "label" name = "uptime" label = "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}" }
-        ]
-    }
-
-    $power_menu = {
-        type = "custom"
-        class = "power-menu"
-
-        bar = [ $button ]
-        popup = [ $popup ]
-    }
-} in {
-    end = [ $power_menu { type = "clock" }  ]
-}
--- a/examples/style.css
+++ b/examples/style.css
@@ -1,31 +1,19 @@
 * {
    /* `otf-font-awesome` is required to be installed for icons */
    font-family: Noto Sans Nerd Font, sans-serif;
-    /* font-family: 'Jetbrains Mono', monospace;*/
    font-size: 16px;

-    /*color: white;*/
-    /*background-color: #2d2d2d;*/
-    /*background-color: red;*/
    border: none;
-
-    /*opacity: 0.4;*/
 }

 #bar {
    border-top: 1px solid #424242;
 }

-.container {
+.background, .container {
    background-color: #2d2d2d;
 }

-/* test  34543*/
-
-#right > * + * {
-    margin-left: 20px;
-}
-
 #workspaces .item {
    color: white;
    background-color: #2d2d2d;
@@ -57,7 +45,7 @@

 #launcher .focused {
    color: white;
-    background-color: black;
+    background-color: #1c1c1c;
    border-bottom: 4px solid #6699cc;
 }

@@ -66,25 +54,54 @@
    background-color: #8f0a0a;
 }

+#popup-launcher .popup-item {
+    color: white;
+    background-color: #2d2d2d;
+    border-radius: 0;
+}
+
+#popup-launcher .popup-item:hover {
+    background-color: #1c1c1c;
+}
+
+#popup-launcher .popup-item:not(:first-child) {
+    border-top: 1px solid white;
+}
+
 #clock {
    color: white;
    background-color: #2d2d2d;
    font-weight: bold;
+    margin-left: 5px;
+}
+
+#clock:hover {
+    background-color: #1c1c1c;
 }

 #script {
+    padding-left: 10px;
    color: white;
 }

 #sysinfo {
+    margin-left: 10px;
    color: white;
 }

+#sysinfo #item {
+    margin-left: 5px;
+}
+
+#tray {
+    margin-left: 10px;
+}
+
 #tray .item {
    background-color: #2d2d2d;
 }

-#mpd {
+#music {
    background-color: #2d2d2d;
    color: white;
 }
@@ -119,30 +136,105 @@
    background-color: #6699cc;
 }

-#popup-mpd {
+#music:hover {
+    background-color: #1c1c1c;
+}
+
+#popup-music {
    color: white;
    padding: 1em;
 }

-#popup-mpd #album-art {
-    /*border: 1px solid #424242;*/
+#popup-music #album-art {
    margin-right: 1em;
 }

-#popup-mpd #title .icon, #popup-mpd #title .label {
+#popup-music #title .icon *, #popup-music #title .label {
    font-size: 1.7em;
 }

-#popup-mpd #controls * {
+#popup-music #controls * {
    border-radius: 0;
    background-color: #2d2d2d;
    color: white;
 }

-#popup-mpd #controls *:disabled {
+#popup-music #controls *:disabled {
    color: #424242;
 }

+#popup-music #volume > box:last-child label {
+    margin-left: 6px;
+}
+
 #focused {
    color: white;
 }
+
+.power-menu {
+    margin-left: 10px;
+}
+
+.power-menu #power-btn {
+    color: white;
+    background-color: #2d2d2d;
+}
+
+.power-menu #power-btn:hover {
+    background-color: #1c1c1c;
+}
+
+.popup-power-menu {
+    padding: 1em;
+}
+
+.popup-power-menu #header {
+    color: white;
+    font-size: 1.4em;
+    border-bottom: 1px solid white;
+    padding-bottom: 0.4em;
+    margin-bottom: 0.8em;
+}
+
+.popup-power-menu .power-btn {
+    color: white;
+    background-color: #2d2d2d;
+    border: 1px solid white;
+    padding: 0.6em 1em;
+}
+
+.popup-power-menu .power-btn + .power-btn {
+    margin-left: 1em;
+}
+
+.popup-power-menu .power-btn:hover {
+    background-color: #1c1c1c;
+}
+
+#clipboard * {
+    font-size: 1.8em;
+}
+
+#popup-clipboard {
+    padding: 1em;
+    color: white;
+}
+
+#popup-clipboard .item {
+    border-bottom: 1px solid #424242;
+}
+
+#popup-clipboard .btn > *:nth-child(2) {
+    padding: 10px;
+}
+
+#popup-clipboard .btn-remove {
+    background-color: #2d2d2d;
+    color: white;
+    font-size: 1.2em;
+    border-left: 1px solid #424242;
+}
+
+#popup-clipboard .btn-remove:hover {
+    color: #fcc;
+}
--- a/examples/sys-info.corn
+++ b/examples/sys-info.corn
@@ -1,23 +0,0 @@
-{
-    end = [
-        {
-            type = "sys_info"
-
-            interval.memory = 30
-            interval.cpu = 1
-            interval.temps = 5
-            interval.disks = 300
-            interval.networks = 3
-
-            format = [
-                " {cpu_percent}% | {temp_c:k10temp_Tccd1}°C"
-                " {memory_used} / {memory_total} GB ({memory_percent}%)"
-                "| {swap_used} / {swap_total} GB ({swap_percent}%)"
-                " {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)"
-                "李 {net_down:enp39s0} / {net_up:enp39s0} Mbps"
-                "猪 {load_average:1} | {load_average:5} | {load_average:15}"
-                " {uptime}"
-            ]
-        }
-    ]
-}
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1668994630,
-        "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=",
+        "lastModified": 1680213900,
+        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b",
+        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
        "type": "github"
      },
      "original": {
@@ -45,11 +45,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1669084742,
-        "narHash": "sha256-aLYwYVnrmEE1LVqd17v99CuqVmAZQrlgi2DVTAs4wFg=",
+        "lastModified": 1680229280,
+        "narHash": "sha256-9UoyQCeKUmHcsIdpsAgcz41LAIDkWhI2PhVDjckrpg0=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "9652ef34c7439eca9f86cee11e94dbef5c9adb09",
+        "rev": "aa480d799023141e1b9e5d6108700de63d9ad002",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -6,9 +6,6 @@
      url = "github:oxalica/rust-overlay";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    #nci.url = "github:yusdacra/nix-cargo-integration";
-    #nci.inputs.nixpkgs.follows = "nixpkgs";
-    #nci.inputs.rust-overlay.follows = "rust-overlay";
  };
  outputs = {
    self,
@@ -39,18 +36,16 @@
        cargo = rust;
        rustc = rust;
      };
+      props = builtins.fromTOML (builtins.readFile ./Cargo.toml);
+      mkDate = longDate: (lib.concatStringsSep "-" [
+        (builtins.substring 0 4 longDate)
+        (builtins.substring 4 2 longDate)
+        (builtins.substring 6 2 longDate)
+      ]);
    in {
-      ironbar = rustPlatform.buildRustPackage {
-        pname = "ironbar";
-        version = self.rev or "dirty";
-        src = builtins.path {
-          name = "ironbar";
-          path = prev.lib.cleanSource ./.;
-        };
-        cargoDeps = rustPlatform.importCargoLock {lockFile = ./Cargo.lock;};
-        cargoLock.lockFile = ./Cargo.lock;
-        nativeBuildInputs = with prev; [pkg-config];
-        buildInputs = with prev; [gtk3 gdk-pixbuf gtk-layer-shell libxkbcommon];
+      ironbar = prev.callPackage ./nix/default.nix {
+        version = props.package.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+        inherit rustPlatform;
      };
    };
    packages = genSystems (
@@ -74,6 +69,7 @@
          gtk3
          gtk-layer-shell
          pkg-config
+          openssl
        ];

        RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
@@ -86,7 +82,7 @@
      ...
    }: let
      cfg = config.programs.ironbar;
-      defaultIronbarPackage = self.packages.${pkgs.system}.default;
+      defaultIronbarPackage = self.packages.${pkgs.hostPlatform.system}.default;
      jsonFormat = pkgs.formats.json {};
    in {
      options.programs.ironbar = {
@@ -94,49 +90,61 @@
        package = lib.mkOption {
          type = with lib.types; package;
          default = defaultIronbarPackage;
-          description = "The package for ironbar to use";
+          description = "The package for ironbar to use.";
        };
        systemd = lib.mkOption {
          type = lib.types.bool;
          default = pkgs.stdenv.isLinux;
-          description = "Whether to enable to systemd service for ironbar";
+          description = "Whether to enable to systemd service for ironbar.";
        };
        style = lib.mkOption {
          type = lib.types.lines;
          default = "";
-          description = "The stylesheet to apply to ironbar";
+          description = "The stylesheet to apply to ironbar.";
        };
        config = lib.mkOption {
          type = jsonFormat.type;
          default = {};
-          description = "The config to pass to ironbar";
+          description = "The config to pass to ironbar.";
+        };
+        features = lib.mkOption {
+          type = lib.types.listOf lib.types.nonEmptyStr;
+          default = [];
+          description = "The features to be used.";
        };
      };
-      config = lib.mkIf cfg.enable {
-        home.packages = [cfg.package];
-        xdg.configFile = {
-          "ironbar/config.json" = lib.mkIf (cfg.config != "") {
-            source = jsonFormat.generate "ironbar-config" cfg.config;
+      config = let
+        pkg = cfg.package.override {features = cfg.features;};
+      in
+        lib.mkIf cfg.enable {
+          home.packages = [pkg];
+          xdg.configFile = {
+            "ironbar/config.json" = lib.mkIf (cfg.config != "") {
+              source = jsonFormat.generate "ironbar-config" cfg.config;
+            };
+            "ironbar/style.css" = lib.mkIf (cfg.style != "") {
+              text = cfg.style;
+            };
          };
-          "ironbar/style.css" = lib.mkIf (cfg.style != "") {
-            text = cfg.style;
+          systemd.user.services.ironbar = lib.mkIf cfg.systemd {
+            Unit = {
+              Description = "Systemd service for Ironbar";
+              Requires = ["graphical-session.target"];
+            };
+            Service = {
+              Type = "simple";
+              ExecStart = "${pkg}/bin/ironbar";
+            };
+            Install.WantedBy = [
+              (lib.mkIf config.wayland.windowManager.hyprland.systemdIntegration "hyprland-session.target")
+              (lib.mkIf config.wayland.windowManager.sway.systemdIntegration "sway-session.target")
+            ];
          };
        };
-        systemd.user.services.ironbar = lib.mkIf cfg.systemd {
-          Unit = {
-            Description = "Systemd service for Ironbar";
-            Requires = ["graphical-session.target"];
-          };
-          Service = {
-            Type = "simple";
-            ExecStart = "${cfg.package}/bin/ironbar";
-          };
-          Install.WantedBy = [
-            (lib.mkIf config.wayland.windowManager.hyprland.systemdIntegration "hyprland-session.target")
-            (lib.mkIf config.wayland.windowManager.sway.systemdIntegration "sway-session.target")
-          ];
-        };
-      };
    };
  };
+  nixConfig = {
+    extra-substituters = ["https://jakestanger.cachix.org"];
+    extra-trusted-public-keys = ["jakestanger.cachix.org-1:VWJE7AWNe5/KOEvCQRxoE8UsI2Xs2nHULJ7TEjYm7mM="];
+  };
 }
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -0,0 +1,36 @@
+{
+  gtk3,
+  gdk-pixbuf,
+  gtk-layer-shell,
+  libxkbcommon,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  lib,
+  version ? "git",
+  features ? [],
+}:
+rustPlatform.buildRustPackage {
+  inherit version;
+  pname = "ironbar";
+  src = builtins.path {
+    name = "ironbar";
+    path = lib.cleanSource ../.;
+  };
+  buildNoDefaultFeatures =
+    if features == []
+    then false
+    else true;
+  buildFeatures = features;
+  cargoDeps = rustPlatform.importCargoLock {lockFile = ../Cargo.lock;};
+  cargoLock.lockFile = ../Cargo.lock;
+  nativeBuildInputs = [pkg-config];
+  buildInputs = [gtk3 gdk-pixbuf gtk-layer-shell libxkbcommon openssl];
+  meta = with lib; {
+    homepage = "https://github.com/JakeStanger/ironbar";
+    description = "Customisable gtk-layer-shell wlroots/sway bar written in rust.";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    mainProgram = "Hyprland";
+  };
+}
--- a/src/bar.rs
+++ b/src/bar.rs
@@ -1,23 +1,15 @@
 use crate::bridge_channel::BridgeChannel;
-use crate::config::{BarPosition, ModuleConfig};
+use crate::config::{BarPosition, CommonConfig, MarginConfig, ModuleConfig};
 use crate::dynamic_string::DynamicString;
-use crate::modules::custom::ExecEvent;
-use crate::modules::launcher::{ItemEvent, LauncherUpdate};
-use crate::modules::mpd::{PlayerCommand, SongUpdate};
-use crate::modules::workspaces::WorkspaceUpdate;
-use crate::modules::{Module, ModuleInfoBuilder, ModuleLocation, ModuleUpdateEvent, WidgetContext};
+use crate::modules::{Module, ModuleInfo, ModuleLocation, ModuleUpdateEvent, WidgetContext};
 use crate::popup::Popup;
 use crate::script::{OutputStream, Script};
-use crate::{await_sync, Config};
-use chrono::{DateTime, Local};
+use crate::{await_sync, read_lock, send, write_lock, Config};
 use color_eyre::Result;
-use gtk::gdk::Monitor;
+use gtk::gdk::{EventMask, Monitor, ScrollDirection};
 use gtk::prelude::*;
-use gtk::{Application, ApplicationWindow, Orientation};
-use std::collections::HashMap;
+use gtk::{Application, ApplicationWindow, EventBox, IconTheme, Orientation, Widget};
 use std::sync::{Arc, RwLock};
-use stray::message::NotifierItemCommand;
-use stray::NotifierItemMessage;
 use tokio::spawn;
 use tokio::sync::mpsc;
 use tracing::{debug, error, info, trace};
@@ -32,7 +24,13 @@ pub fn create_bar(
 ) -> Result<()> {
    let win = ApplicationWindow::builder().application(app).build();

-    setup_layer_shell(&win, monitor, config.position, config.anchor_to_edges);
+    setup_layer_shell(
+        &win,
+        monitor,
+        config.position,
+        config.anchor_to_edges,
+        config.margin,
+    );

    let orientation = config.position.get_orientation();

@@ -49,26 +47,11 @@ pub fn create_bar(
    }
    .build();

-    let start = gtk::Box::builder()
-        .orientation(orientation)
-        .spacing(0)
-        .name("start")
-        .build();
-    let center = gtk::Box::builder()
-        .orientation(orientation)
-        .spacing(0)
-        .name("center")
-        .build();
-    let end = gtk::Box::builder()
-        .orientation(orientation)
-        .spacing(0)
-        .name("end")
-        .build();
-
    content.style_context().add_class("container");
-    start.style_context().add_class("container");
-    center.style_context().add_class("container");
-    end.style_context().add_class("container");
+
+    let start = create_container("start", orientation);
+    let center = create_container("center", orientation);
+    let end = create_container("end", orientation);

    content.add(&start);
    content.set_center_widget(Some(&center));
@@ -84,6 +67,9 @@ pub fn create_bar(
    });

    debug!("Showing bar");
+
+    // show each box but do not use `show_all`.
+    // this ensures `show_if` option works as intended.
    start.show();
    center.show();
    end.show();
@@ -93,234 +79,24 @@ pub fn create_bar(
    Ok(())
 }

-/// Loads the configured modules onto a bar.
-fn load_modules(
-    left: &gtk::Box,
-    center: &gtk::Box,
-    right: &gtk::Box,
-    app: &Application,
-    config: Config,
-    monitor: &Monitor,
-    output_name: &str,
-) -> Result<()> {
-    let mut info_builder = ModuleInfoBuilder::default();
-    let info_builder = info_builder
-        .app(app)
-        .bar_position(config.position)
-        .monitor(monitor)
-        .output_name(output_name);
-
-    if let Some(modules) = config.start {
-        let info_builder = info_builder.location(ModuleLocation::Left);
-
-        add_modules(left, modules, info_builder)?;
-    }
-
-    if let Some(modules) = config.center {
-        let info_builder = info_builder.location(ModuleLocation::Center);
-
-        add_modules(center, modules, info_builder)?;
-    }
-
-    if let Some(modules) = config.end {
-        let info_builder = info_builder.location(ModuleLocation::Right);
-
-        add_modules(right, modules, info_builder)?;
-    }
-
-    Ok(())
-}
-
-/// Adds modules into a provided GTK box,
-/// which should be one of its left, center or right containers.
-fn add_modules(
-    content: &gtk::Box,
-    modules: Vec<ModuleConfig>,
-    info_builder: &mut ModuleInfoBuilder,
-) -> Result<()> {
-    let base_popup_info = info_builder.module_name("").build()?;
-    let popup = Popup::new(&base_popup_info);
-    let popup = Arc::new(RwLock::new(popup));
-
-    macro_rules! add_module {
-        ($module:expr, $id:expr, $name:literal, $send_message:ty, $receive_message:ty) => {
-            let info = info_builder.module_name($name).build()?;
-
-            let (w_tx, w_rx) = glib::MainContext::channel::<$send_message>(glib::PRIORITY_DEFAULT);
-            let (p_tx, p_rx) = glib::MainContext::channel::<$send_message>(glib::PRIORITY_DEFAULT);
-
-            let channel = BridgeChannel::<ModuleUpdateEvent<$send_message>>::new();
-            let (ui_tx, ui_rx) = mpsc::channel::<$receive_message>(16);
-
-            $module.spawn_controller(&info, channel.create_sender(), ui_rx)?;
-
-            let context = WidgetContext {
-                id: $id,
-                widget_rx: w_rx,
-                popup_rx: p_rx,
-                tx: channel.create_sender(),
-                controller_tx: ui_tx,
-            };
-
-            let common = $module.common.clone();
-
-            let widget = $module.into_widget(context, &info)?;
-
-            let container = gtk::EventBox::new();
-            container.add(&widget.widget);
-
-            content.add(&container);
-            widget.widget.set_widget_name(info.module_name);
-
-            if let Some(show_if) = common.show_if {
-                let script = Script::new_polling(show_if);
-                let container = container.clone();
-
-                let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);
-
-                spawn(async move {
-                    script
-                        .run(|(_, success)| {
-                            tx.send(success)
-                                .expect("Failed to send widget visibility toggle message");
-                        })
-                        .await;
-                });
-
-                rx.attach(None, move |success| {
-                    if success {
-                        container.show_all()
-                    } else {
-                        container.hide()
-                    };
-                    Continue(true)
-                });
-            } else {
-                container.show_all();
-            }
-
-            if let Some(on_click) = common.on_click {
-                let script = Script::new_polling(on_click);
-                container.connect_button_press_event(move |_, _| {
-                    trace!("Running on-click script");
-                    match await_sync(async { script.get_output().await }) {
-                        Ok((OutputStream::Stderr(out), _)) => error!("{out}"),
-                        Err(err) => error!("{err:?}"),
-                        _ => {}
-                    }
-                    Inhibit(false)
-                });
-            }
-
-            if let Some(tooltip) = common.tooltip {
-                DynamicString::new(&tooltip, move |string| {
-                    container.set_tooltip_text(Some(&string));
-                    Continue(true)
-                });
-            }
-
-            let has_popup = widget.popup.is_some();
-            if let Some(popup_content) = widget.popup {
-                popup
-                    .write()
-                    .expect("Failed to get write lock on popup")
-                    .register_content($id, popup_content);
-            }
-
-            let popup2 = Arc::clone(&popup);
-            channel.recv(move |ev| {
-                let popup = popup2.clone();
-                match ev {
-                    ModuleUpdateEvent::Update(update) => {
-                        if has_popup {
-                            p_tx.send(update.clone())
-                                .expect("Failed to send update to popup");
-                        }
-
-                        w_tx.send(update).expect("Failed to send update to module");
-                    }
-                    ModuleUpdateEvent::TogglePopup(geometry) => {
-                        debug!("Toggling popup for {} [#{}]", $name, $id);
-                        let popup = popup.read().expect("Failed to get read lock on popup");
-                        if popup.is_visible() {
-                            popup.hide()
-                        } else {
-                            popup.show_content($id);
-                            popup.show(geometry);
-                        }
-                    }
-                    ModuleUpdateEvent::OpenPopup(geometry) => {
-                        debug!("Opening popup for {} [#{}]", $name, $id);
-
-                        let popup = popup.read().expect("Failed to get read lock on popup");
-                        popup.hide();
-                        popup.show_content($id);
-                        popup.show(geometry);
-                    }
-                    ModuleUpdateEvent::ClosePopup => {
-                        debug!("Closing popup for {} [#{}]", $name, $id);
-
-                        let popup = popup.read().expect("Failed to get read lock on popup");
-                        popup.hide();
-                    }
-                }
-
-                Continue(true)
-            });
-        };
-    }
-
-    for (id, config) in modules.into_iter().enumerate() {
-        match config {
-            ModuleConfig::Clock(module) => {
-                add_module!(module, id, "clock", DateTime<Local>, ());
-            }
-            ModuleConfig::Script(module) => {
-                add_module!(module, id, "script", String, ());
-            }
-            ModuleConfig::SysInfo(module) => {
-                add_module!(module, id, "sysinfo", HashMap<String, String>, ());
-            }
-            ModuleConfig::Focused(module) => {
-                add_module!(module, id, "focused", (String, String), ());
-            }
-            ModuleConfig::Workspaces(module) => {
-                add_module!(module, id, "workspaces", WorkspaceUpdate, String);
-            }
-            ModuleConfig::Tray(module) => {
-                add_module!(module, id, "tray", NotifierItemMessage, NotifierItemCommand);
-            }
-            ModuleConfig::Mpd(module) => {
-                add_module!(module, id, "mpd", Option<SongUpdate>, PlayerCommand);
-            }
-            ModuleConfig::Launcher(module) => {
-                add_module!(module, id, "launcher", LauncherUpdate, ItemEvent);
-            }
-            ModuleConfig::Custom(module) => {
-                add_module!(module, id, "custom", (), ExecEvent);
-            }
-        }
-    }
-
-    Ok(())
-}
-
 /// Sets up GTK layer shell for a provided application window.
 fn setup_layer_shell(
    win: &ApplicationWindow,
    monitor: &Monitor,
    position: BarPosition,
    anchor_to_edges: bool,
+    margin: MarginConfig,
 ) {
    gtk_layer_shell::init_for_window(win);
    gtk_layer_shell::set_monitor(win, monitor);
    gtk_layer_shell::set_layer(win, gtk_layer_shell::Layer::Top);
    gtk_layer_shell::auto_exclusive_zone_enable(win);
+    gtk_layer_shell::set_namespace(win, env!("CARGO_PKG_NAME"));

-    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Top, 0);
-    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Bottom, 0);
-    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Left, 0);
-    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Right, 0);
+    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Top, margin.top);
+    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Bottom, margin.bottom);
+    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Left, margin.left);
+    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Right, margin.right);

    let bar_orientation = position.get_orientation();

@@ -349,3 +125,316 @@ fn setup_layer_shell(
            || (bar_orientation == Orientation::Horizontal && anchor_to_edges),
    );
 }
+
+/// Creates a `gtk::Box` container to place widgets inside.
+fn create_container(name: &str, orientation: Orientation) -> gtk::Box {
+    let container = gtk::Box::builder()
+        .orientation(orientation)
+        .spacing(0)
+        .name(name)
+        .build();
+
+    container.style_context().add_class("container");
+    container
+}
+
+/// Loads the configured modules onto a bar.
+fn load_modules(
+    left: &gtk::Box,
+    center: &gtk::Box,
+    right: &gtk::Box,
+    app: &Application,
+    config: Config,
+    monitor: &Monitor,
+    output_name: &str,
+) -> Result<()> {
+    let icon_theme = IconTheme::new();
+    if let Some(ref theme) = config.icon_theme {
+        icon_theme.set_custom_theme(Some(theme));
+    }
+
+    macro_rules! info {
+        ($location:expr) => {
+            ModuleInfo {
+                app,
+                bar_position: config.position,
+                monitor,
+                output_name,
+                location: $location,
+                icon_theme: &icon_theme,
+            }
+        };
+    }
+
+    if let Some(modules) = config.start {
+        let info = info!(ModuleLocation::Left);
+        add_modules(left, modules, &info)?;
+    }
+
+    if let Some(modules) = config.center {
+        let info = info!(ModuleLocation::Center);
+        add_modules(center, modules, &info)?;
+    }
+
+    if let Some(modules) = config.end {
+        let info = info!(ModuleLocation::Right);
+        add_modules(right, modules, &info)?;
+    }
+
+    Ok(())
+}
+
+/// Adds modules into a provided GTK box,
+/// which should be one of its left, center or right containers.
+fn add_modules(content: &gtk::Box, modules: Vec<ModuleConfig>, info: &ModuleInfo) -> Result<()> {
+    let popup = Popup::new(info);
+    let popup = Arc::new(RwLock::new(popup));
+
+    macro_rules! add_module {
+        ($module:expr, $id:expr) => {{
+            let common = $module.common.take().expect("Common config did not exist");
+            let widget = create_module(*$module, $id, &info, &Arc::clone(&popup))?;
+
+            let container = wrap_widget(&widget);
+            content.add(&container);
+            setup_module_common_options(container, common);
+        }};
+    }
+
+    for (id, config) in modules.into_iter().enumerate() {
+        match config {
+            #[cfg(feature = "clipboard")]
+            ModuleConfig::Clipboard(mut module) => add_module!(module, id),
+            #[cfg(feature = "clock")]
+            ModuleConfig::Clock(mut module) => add_module!(module, id),
+            ModuleConfig::Custom(mut module) => add_module!(module, id),
+            ModuleConfig::Focused(mut module) => add_module!(module, id),
+            ModuleConfig::Launcher(mut module) => add_module!(module, id),
+            #[cfg(feature = "music")]
+            ModuleConfig::Music(mut module) => add_module!(module, id),
+            ModuleConfig::Script(mut module) => add_module!(module, id),
+            #[cfg(feature = "sys_info")]
+            ModuleConfig::SysInfo(mut module) => add_module!(module, id),
+            #[cfg(feature = "tray")]
+            ModuleConfig::Tray(mut module) => add_module!(module, id),
+            #[cfg(feature = "workspaces")]
+            ModuleConfig::Workspaces(mut module) => add_module!(module, id),
+        }
+    }
+
+    Ok(())
+}
+
+/// Creates a module and sets it up.
+/// This setup includes widget/popup content and event channels.
+fn create_module<TModule, TWidget, TSend, TRec>(
+    module: TModule,
+    id: usize,
+    info: &ModuleInfo,
+    popup: &Arc<RwLock<Popup>>,
+) -> Result<TWidget>
+where
+    TModule: Module<TWidget, SendMessage = TSend, ReceiveMessage = TRec>,
+    TWidget: IsA<Widget>,
+    TSend: Clone + Send + 'static,
+{
+    let (w_tx, w_rx) = glib::MainContext::channel::<TSend>(glib::PRIORITY_DEFAULT);
+    let (p_tx, p_rx) = glib::MainContext::channel::<TSend>(glib::PRIORITY_DEFAULT);
+
+    let channel = BridgeChannel::<ModuleUpdateEvent<TSend>>::new();
+    let (ui_tx, ui_rx) = mpsc::channel::<TRec>(16);
+
+    module.spawn_controller(info, channel.create_sender(), ui_rx)?;
+
+    let context = WidgetContext {
+        id,
+        widget_rx: w_rx,
+        popup_rx: p_rx,
+        tx: channel.create_sender(),
+        controller_tx: ui_tx,
+    };
+
+    let name = TModule::name();
+
+    let module_parts = module.into_widget(context, info)?;
+    module_parts.widget.set_widget_name(name);
+
+    let mut has_popup = false;
+    if let Some(popup_content) = module_parts.popup {
+        register_popup_content(popup, id, popup_content);
+        has_popup = true;
+    }
+
+    setup_receiver(channel, w_tx, p_tx, popup.clone(), name, id, has_popup);
+
+    Ok(module_parts.widget)
+}
+
+/// Registers the popup content with the popup.
+fn register_popup_content(popup: &Arc<RwLock<Popup>>, id: usize, popup_content: gtk::Box) {
+    write_lock!(popup).register_content(id, popup_content);
+}
+
+/// Sets up the bridge channel receiver
+/// to pick up events from the controller, widget or popup.
+///
+/// Handles opening/closing popups
+/// and communicating update messages between controllers and widgets/popups.
+fn setup_receiver<TSend>(
+    channel: BridgeChannel<ModuleUpdateEvent<TSend>>,
+    w_tx: glib::Sender<TSend>,
+    p_tx: glib::Sender<TSend>,
+    popup: Arc<RwLock<Popup>>,
+    name: &'static str,
+    id: usize,
+    has_popup: bool,
+) where
+    TSend: Clone + Send + 'static,
+{
+    // some rare cases can cause the popup to incorrectly calculate its size on first open.
+    // we can fix that by just force re-rendering it on its first open.
+    let mut has_popup_opened = false;
+
+    channel.recv(move |ev| {
+        match ev {
+            ModuleUpdateEvent::Update(update) => {
+                if has_popup {
+                    send!(p_tx, update.clone());
+                }
+
+                send!(w_tx, update);
+            }
+            ModuleUpdateEvent::TogglePopup(geometry) => {
+                debug!("Toggling popup for {} [#{}]", name, id);
+                let popup = read_lock!(popup);
+                if popup.is_visible() {
+                    popup.hide();
+                } else {
+                    popup.show_content(id);
+                    popup.show(geometry);
+
+                    if !has_popup_opened {
+                        popup.show_content(id);
+                        popup.show(geometry);
+                        has_popup_opened = true;
+                    }
+                }
+            }
+            ModuleUpdateEvent::OpenPopup(geometry) => {
+                debug!("Opening popup for {} [#{}]", name, id);
+
+                let popup = read_lock!(popup);
+                popup.hide();
+                popup.show_content(id);
+                popup.show(geometry);
+
+                if !has_popup_opened {
+                    popup.show_content(id);
+                    popup.show(geometry);
+                    has_popup_opened = true;
+                }
+            }
+            ModuleUpdateEvent::ClosePopup => {
+                debug!("Closing popup for {} [#{}]", name, id);
+
+                let popup = read_lock!(popup);
+                popup.hide();
+            }
+        }
+
+        Continue(true)
+    });
+}
+
+/// Takes a widget and adds it into a new `gtk::EventBox`.
+/// The event box container is returned.
+fn wrap_widget<W: IsA<Widget>>(widget: &W) -> EventBox {
+    let container = EventBox::new();
+    container.add_events(EventMask::SCROLL_MASK);
+    container.add(widget);
+    container
+}
+
+/// Configures the module's container according to the common config options.
+fn setup_module_common_options(container: EventBox, common: CommonConfig) {
+    common.show_if.map_or_else(
+        || {
+            container.show_all();
+        },
+        |show_if| {
+            let script = Script::new_polling(show_if);
+            let container = container.clone();
+            let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);
+            spawn(async move {
+                script
+                    .run(|(_, success)| {
+                        send!(tx, success);
+                    })
+                    .await;
+            });
+            rx.attach(None, move |success| {
+                if success {
+                    container.show_all();
+                } else {
+                    container.hide();
+                };
+                Continue(true)
+            });
+        },
+    );
+
+    let left_click_script = common.on_click_left.map(Script::new_polling);
+    let middle_click_script = common.on_click_middle.map(Script::new_polling);
+    let right_click_script = common.on_click_right.map(Script::new_polling);
+
+    container.connect_button_press_event(move |_, event| {
+        let script = match event.button() {
+            1 => left_click_script.as_ref(),
+            2 => middle_click_script.as_ref(),
+            3 => right_click_script.as_ref(),
+            _ => None,
+        };
+
+        if let Some(script) = script {
+            trace!("Running on-click script: {}", event.button());
+
+            match await_sync(async { script.get_output().await }) {
+                Ok((OutputStream::Stderr(out), _)) => error!("{out}"),
+                Err(err) => error!("{err:?}"),
+                _ => {}
+            }
+        }
+
+        Inhibit(false)
+    });
+
+    let scroll_up_script = common.on_scroll_up.map(Script::new_polling);
+    let scroll_down_script = common.on_scroll_down.map(Script::new_polling);
+
+    container.connect_scroll_event(move |_, event| {
+        let script = match event.direction() {
+            ScrollDirection::Up => scroll_up_script.as_ref(),
+            ScrollDirection::Down => scroll_down_script.as_ref(),
+            _ => None,
+        };
+
+        if let Some(script) = script {
+            trace!("Running on-scroll script: {}", event.direction());
+
+            match await_sync(async { script.get_output().await }) {
+                Ok((OutputStream::Stderr(out), _)) => error!("{out}"),
+                Err(err) => error!("{err:?}"),
+                _ => {}
+            }
+        }
+
+        Inhibit(false)
+    });
+
+    if let Some(tooltip) = common.tooltip {
+        DynamicString::new(&tooltip, move |string| {
+            container.set_tooltip_text(Some(&string));
+            Continue(true)
+        });
+    }
+}
--- a/src/bridge_channel.rs
+++ b/src/bridge_channel.rs
@@ -1,3 +1,4 @@
+use crate::send;
 use tokio::spawn;
 use tokio::sync::mpsc;

@@ -21,7 +22,7 @@ impl<T: Send + 'static> BridgeChannel<T> {

        spawn(async move {
            while let Some(val) = async_rx.recv().await {
-                sync_tx.send(val).expect("Failed to send message");
+                send!(sync_tx, val);
            }
        });

--- a/src/clients/clipboard.rs
+++ b/src/clients/clipboard.rs
@@ -0,0 +1,244 @@
+use super::wayland::{self, ClipboardItem};
+use crate::{lock, try_send};
+use indexmap::map::Iter;
+use indexmap::IndexMap;
+use lazy_static::lazy_static;
+use std::sync::{Arc, Mutex};
+use tokio::spawn;
+use tokio::sync::mpsc;
+use tracing::debug;
+
+#[derive(Debug)]
+pub enum ClipboardEvent {
+    Add(Arc<ClipboardItem>),
+    Remove(usize),
+    Activate(usize),
+}
+
+type EventSender = mpsc::Sender<ClipboardEvent>;
+
+/// Clipboard client singleton,
+/// to ensure bars don't duplicate requests to the compositor.
+pub struct ClipboardClient {
+    senders: Arc<Mutex<Vec<(EventSender, usize)>>>,
+    cache: Arc<Mutex<ClipboardCache>>,
+}
+
+impl ClipboardClient {
+    fn new() -> Self {
+        let senders = Arc::new(Mutex::new(Vec::<(EventSender, usize)>::new()));
+
+        let cache = Arc::new(Mutex::new(ClipboardCache::new()));
+
+        {
+            let senders = senders.clone();
+            let cache = cache.clone();
+
+            spawn(async move {
+                let mut rx = {
+                    let wl = wayland::get_client().await;
+                    wl.subscribe_clipboard()
+                };
+
+                while let Ok(item) = rx.recv().await {
+                    debug!("Received clipboard item (ID: {})", item.id);
+
+                    let (existing_id, cache_size) = {
+                        let cache = lock!(cache);
+                        (cache.contains(&item), cache.len())
+                    };
+
+                    existing_id.map_or_else(
+                        || {
+                            {
+                                let mut cache = lock!(cache);
+                                let senders = lock!(senders);
+                                cache.insert(item.clone(), senders.len());
+                            }
+                            let senders = lock!(senders);
+                            let iter = senders.iter();
+                            for (tx, sender_cache_size) in iter {
+                                if cache_size == *sender_cache_size {
+                                    let mut cache = lock!(cache);
+                                    let removed_id = cache
+                                        .remove_ref_first()
+                                        .expect("Clipboard cache unexpectedly empty");
+                                    try_send!(tx, ClipboardEvent::Remove(removed_id));
+                                }
+                                try_send!(tx, ClipboardEvent::Add(item.clone()));
+                            }
+                        },
+                        |existing_id| {
+                            let senders = lock!(senders);
+                            let iter = senders.iter();
+                            for (tx, _) in iter {
+                                try_send!(tx, ClipboardEvent::Activate(existing_id));
+                            }
+                        },
+                    );
+                }
+            });
+        }
+
+        Self { senders, cache }
+    }
+
+    pub async fn subscribe(&self, cache_size: usize) -> mpsc::Receiver<ClipboardEvent> {
+        let (tx, rx) = mpsc::channel(16);
+
+        let wl = wayland::get_client().await;
+        wl.roundtrip();
+
+        {
+            let mut cache = lock!(self.cache);
+
+            if let Some(item) = wl.get_clipboard() {
+                cache.insert_or_inc_ref(item);
+            }
+
+            let iter = cache.iter();
+            for (_, (item, _)) in iter {
+                try_send!(tx, ClipboardEvent::Add(item.clone()));
+            }
+        }
+
+        {
+            let mut senders = lock!(self.senders);
+            senders.push((tx, cache_size));
+        }
+
+        rx
+    }
+
+    pub async fn copy(&self, id: usize) {
+        debug!("Copying item with id {id}");
+
+        let item = {
+            let cache = lock!(self.cache);
+            cache.get(id)
+        };
+
+        if let Some(item) = item {
+            let wl = wayland::get_client().await;
+            wl.copy_to_clipboard(item);
+        }
+
+        let senders = lock!(self.senders);
+        let iter = senders.iter();
+        for (tx, _) in iter {
+            try_send!(tx, ClipboardEvent::Activate(id));
+        }
+    }
+
+    pub fn remove(&self, id: usize) {
+        let mut cache = lock!(self.cache);
+        cache.remove(id);
+
+        let senders = lock!(self.senders);
+        let iter = senders.iter();
+        for (tx, _) in iter {
+            try_send!(tx, ClipboardEvent::Remove(id));
+        }
+    }
+}
+
+/// Shared clipboard item cache.
+///
+/// Items are stored with a number of references,
+/// allowing different consumers to 'remove' cached items
+/// at different times.
+#[derive(Debug)]
+struct ClipboardCache {
+    cache: IndexMap<usize, (Arc<ClipboardItem>, usize)>,
+}
+
+impl ClipboardCache {
+    /// Creates a new empty cache.
+    fn new() -> Self {
+        Self {
+            cache: IndexMap::new(),
+        }
+    }
+
+    /// Gets the entry with key `id` from the cache.
+    fn get(&self, id: usize) -> Option<Arc<ClipboardItem>> {
+        self.cache.get(&id).map(|(item, _)| item).cloned()
+    }
+
+    /// Inserts an entry with `ref_count` initial references.
+    fn insert(&mut self, item: Arc<ClipboardItem>, ref_count: usize) -> Option<Arc<ClipboardItem>> {
+        self.cache
+            .insert(item.id, (item, ref_count))
+            .map(|(item, _)| item)
+    }
+
+    /// Inserts an entry with `ref_count` initial references,
+    /// or increments the `ref_count` by 1 if it already exists.
+    fn insert_or_inc_ref(&mut self, item: Arc<ClipboardItem>) {
+        let mut item = self.cache.entry(item.id).or_insert((item, 0));
+        item.1 += 1;
+    }
+
+    /// Removes the entry with key `id`.
+    /// This ignores references.
+    fn remove(&mut self, id: usize) -> Option<Arc<ClipboardItem>> {
+        self.cache.shift_remove(&id).map(|(item, _)| item)
+    }
+
+    /// Removes a reference to the entry with key `id`.
+    ///
+    /// If the reference count reaches zero, the entry
+    /// is removed from the cache.
+    fn remove_ref(&mut self, id: usize) {
+        if let Some(entry) = self.cache.get_mut(&id) {
+            entry.1 -= 1;
+
+            if entry.1 == 0 {
+                self.cache.shift_remove(&id);
+            }
+        }
+    }
+
+    /// Removes a reference to the first entry.
+    ///
+    /// If the reference count reaches zero, the entry
+    /// is removed from the cache.
+    fn remove_ref_first(&mut self) -> Option<usize> {
+        if let Some((id, _)) = self.cache.first() {
+            let id = *id;
+            self.remove_ref(id);
+            Some(id)
+        } else {
+            None
+        }
+    }
+
+    /// Checks if an item with matching mime type and value
+    /// already exists in the cache.
+    fn contains(&self, item: &ClipboardItem) -> Option<usize> {
+        self.cache.values().find_map(|(it, _)| {
+            if it.mime_type == item.mime_type && it.value == item.value {
+                Some(it.id)
+            } else {
+                None
+            }
+        })
+    }
+
+    /// Gets the current number of items in the cache.
+    fn len(&self) -> usize {
+        self.cache.len()
+    }
+
+    fn iter(&self) -> Iter<'_, usize, (Arc<ClipboardItem>, usize)> {
+        self.cache.iter()
+    }
+}
+
+lazy_static! {
+    static ref CLIENT: ClipboardClient = ClipboardClient::new();
+}
+
+pub fn get_client() -> &'static ClipboardClient {
+    &CLIENT
+}
--- a/src/clients/compositor/hyprland.rs
+++ b/src/clients/compositor/hyprland.rs
@@ -0,0 +1,281 @@
+use super::{Workspace, WorkspaceClient, WorkspaceUpdate};
+use crate::{lock, send};
+use color_eyre::Result;
+use hyprland::data::{Workspace as HWorkspace, Workspaces};
+use hyprland::dispatch::{Dispatch, DispatchType, WorkspaceIdentifierWithSpecial};
+use hyprland::event_listener::EventListenerMutable as EventListener;
+use hyprland::prelude::*;
+use hyprland::shared::WorkspaceType;
+use lazy_static::lazy_static;
+use std::sync::{Arc, Mutex};
+use tokio::sync::broadcast::{channel, Receiver, Sender};
+use tokio::task::spawn_blocking;
+use tracing::{debug, error, info};
+
+pub struct EventClient {
+    workspace_tx: Sender<WorkspaceUpdate>,
+    _workspace_rx: Receiver<WorkspaceUpdate>,
+}
+
+impl EventClient {
+    fn new() -> Self {
+        let (workspace_tx, workspace_rx) = channel(16);
+
+        Self {
+            workspace_tx,
+            _workspace_rx: workspace_rx,
+        }
+    }
+
+    fn listen_workspace_events(&self) {
+        info!("Starting Hyprland event listener");
+
+        let tx = self.workspace_tx.clone();
+
+        spawn_blocking(move || {
+            let mut event_listener = EventListener::new();
+
+            // we need a lock to ensure events don't run at the same time
+            let lock = Arc::new(Mutex::new(()));
+
+            // cache the active workspace since Hyprland doesn't give us the prev active
+            let active = Self::get_active_workspace().expect("Failed to get active workspace");
+            let active = Arc::new(Mutex::new(Some(active)));
+
+            {
+                let tx = tx.clone();
+                let lock = lock.clone();
+                let active = active.clone();
+
+                event_listener.add_workspace_added_handler(move |workspace_type, _state| {
+                    let _lock = lock!(lock);
+                    debug!("Added workspace: {workspace_type:?}");
+
+                    let workspace_name = get_workspace_name(workspace_type);
+                    let prev_workspace = lock!(active);
+                    let focused = prev_workspace
+                        .as_ref()
+                        .map_or(false, |w| w.name == workspace_name);
+
+                    let workspace = Self::get_workspace(&workspace_name, focused);
+
+                    if let Some(workspace) = workspace {
+                        send!(tx, WorkspaceUpdate::Add(workspace));
+                    }
+                });
+            }
+
+            {
+                let tx = tx.clone();
+                let lock = lock.clone();
+                let active = active.clone();
+
+                event_listener.add_workspace_change_handler(move |workspace_type, _state| {
+                    let _lock = lock!(lock);
+
+                    let mut prev_workspace = lock!(active);
+
+                    debug!(
+                        "Received workspace change: {:?} -> {workspace_type:?}",
+                        prev_workspace.as_ref().map(|w| &w.id)
+                    );
+
+                    let workspace_name = get_workspace_name(workspace_type);
+                    let focused = prev_workspace
+                        .as_ref()
+                        .map_or(false, |w| w.name == workspace_name);
+                    let workspace = Self::get_workspace(&workspace_name, focused);
+
+                    workspace.map_or_else(
+                        || {
+                            error!("Unable to locate workspace");
+                        },
+                        |workspace| {
+                            // there may be another type of update so dispatch that regardless of focus change
+                            send!(tx, WorkspaceUpdate::Update(workspace.clone()));
+                            if !focused {
+                                Self::send_focus_change(&mut prev_workspace, workspace, &tx);
+                            }
+                        },
+                    );
+                });
+            }
+
+            {
+                let tx = tx.clone();
+                let lock = lock.clone();
+                let active = active.clone();
+
+                event_listener.add_active_monitor_change_handler(move |event_data, _state| {
+                    let _lock = lock!(lock);
+                    let workspace_type = event_data.1;
+
+                    let mut prev_workspace = lock!(active);
+
+                    debug!(
+                        "Received active monitor change: {:?} -> {workspace_type:?}",
+                        prev_workspace.as_ref().map(|w| &w.name)
+                    );
+
+                    let workspace_name = get_workspace_name(workspace_type);
+                    let focused = prev_workspace
+                        .as_ref()
+                        .map_or(false, |w| w.name == workspace_name);
+                    let workspace = Self::get_workspace(&workspace_name, focused);
+
+                    if let (Some(workspace), false) = (workspace, focused) {
+                        Self::send_focus_change(&mut prev_workspace, workspace, &tx);
+                    } else {
+                        error!("Unable to locate workspace");
+                    }
+                });
+            }
+
+            {
+                let tx = tx.clone();
+                let lock = lock.clone();
+
+                event_listener.add_workspace_moved_handler(move |event_data, _state| {
+                    let _lock = lock!(lock);
+                    let workspace_type = event_data.1;
+                    debug!("Received workspace move: {workspace_type:?}");
+
+                    let mut prev_workspace = lock!(active);
+
+                    let workspace_name = get_workspace_name(workspace_type);
+                    let focused = prev_workspace
+                        .as_ref()
+                        .map_or(false, |w| w.name == workspace_name);
+                    let workspace = Self::get_workspace(&workspace_name, focused);
+
+                    if let Some(workspace) = workspace {
+                        send!(tx, WorkspaceUpdate::Move(workspace.clone()));
+
+                        if !focused {
+                            Self::send_focus_change(&mut prev_workspace, workspace, &tx);
+                        }
+                    }
+                });
+            }
+
+            {
+                event_listener.add_workspace_destroy_handler(move |workspace_type, _state| {
+                    let _lock = lock!(lock);
+                    debug!("Received workspace destroy: {workspace_type:?}");
+
+                    let name = get_workspace_name(workspace_type);
+                    send!(tx, WorkspaceUpdate::Remove(name));
+                });
+            }
+
+            event_listener
+                .start_listener()
+                .expect("Failed to start listener");
+        });
+    }
+
+    /// Sends a `WorkspaceUpdate::Focus` event
+    /// and updates the active workspace cache.
+    fn send_focus_change(
+        prev_workspace: &mut Option<Workspace>,
+        workspace: Workspace,
+        tx: &Sender<WorkspaceUpdate>,
+    ) {
+        let old = prev_workspace
+            .as_ref()
+            .map(|w| w.name.clone())
+            .unwrap_or_default();
+
+        send!(
+            tx,
+            WorkspaceUpdate::Focus {
+                old,
+                new: workspace.name.clone(),
+            }
+        );
+
+        prev_workspace.replace(workspace);
+    }
+
+    /// Gets a workspace by name from the server.
+    ///
+    /// Use `focused` to manually mark the workspace as focused,
+    /// as this is not automatically checked.
+    fn get_workspace(name: &str, focused: bool) -> Option<Workspace> {
+        Workspaces::get()
+            .expect("Failed to get workspaces")
+            .find_map(|w| {
+                if w.name == name {
+                    Some(Workspace::from((focused, w)))
+                } else {
+                    None
+                }
+            })
+    }
+
+    /// Gets the active workspace from the server.
+    fn get_active_workspace() -> Result<Workspace> {
+        let w = HWorkspace::get_active().map(|w| Workspace::from((true, w)))?;
+        Ok(w)
+    }
+}
+
+impl WorkspaceClient for EventClient {
+    fn focus(&self, id: String) -> Result<()> {
+        Dispatch::call(DispatchType::Workspace(
+            WorkspaceIdentifierWithSpecial::Name(&id),
+        ))?;
+        Ok(())
+    }
+
+    fn subscribe_workspace_change(&self) -> Receiver<WorkspaceUpdate> {
+        let rx = self.workspace_tx.subscribe();
+
+        {
+            let tx = self.workspace_tx.clone();
+
+            let active_name = HWorkspace::get_active()
+                .map(|active| active.name)
+                .unwrap_or_default();
+
+            let workspaces = Workspaces::get()
+                .expect("Failed to get workspaces")
+                .map(|w| Workspace::from((w.name == active_name, w)))
+                .collect();
+
+            send!(tx, WorkspaceUpdate::Init(workspaces));
+        }
+
+        rx
+    }
+}
+
+lazy_static! {
+    static ref CLIENT: EventClient = {
+        let client = EventClient::new();
+        client.listen_workspace_events();
+        client
+    };
+}
+
+pub fn get_client() -> &'static EventClient {
+    &CLIENT
+}
+
+fn get_workspace_name(name: WorkspaceType) -> String {
+    match name {
+        WorkspaceType::Regular(name) => name,
+        WorkspaceType::Special(name) => name.unwrap_or_default(),
+    }
+}
+
+impl From<(bool, hyprland::data::Workspace)> for Workspace {
+    fn from((focused, workspace): (bool, hyprland::data::Workspace)) -> Self {
+        Self {
+            id: workspace.id.to_string(),
+            name: workspace.name,
+            monitor: workspace.monitor,
+            focused,
+        }
+    }
+}
--- a/src/clients/compositor/mod.rs
+++ b/src/clients/compositor/mod.rs
@@ -0,0 +1,104 @@
+use cfg_if::cfg_if;
+use color_eyre::{Help, Report, Result};
+use std::fmt::{Display, Formatter};
+use tokio::sync::broadcast;
+use tracing::debug;
+
+#[cfg(feature = "workspaces+hyprland")]
+pub mod hyprland;
+#[cfg(feature = "workspaces+sway")]
+pub mod sway;
+
+pub enum Compositor {
+    #[cfg(feature = "workspaces+sway")]
+    Sway,
+    #[cfg(feature = "workspaces+hyprland")]
+    Hyprland,
+    Unsupported,
+}
+
+impl Display for Compositor {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                #[cfg(feature = "workspaces+sway")]
+                Self::Sway => "Sway",
+                #[cfg(feature = "workspaces+hyprland")]
+                Self::Hyprland => "Hyprland",
+                Self::Unsupported => "Unsupported",
+            }
+        )
+    }
+}
+
+impl Compositor {
+    /// Attempts to get the current compositor.
+    /// This is done by checking system env vars.
+    fn get_current() -> Self {
+        if std::env::var("SWAYSOCK").is_ok() {
+            cfg_if! {
+                if #[cfg(feature = "workspaces+sway")] { Self::Sway }
+                else { tracing::error!("Not compiled with Sway support"); Self::Unsupported }
+            }
+        } else if std::env::var("HYPRLAND_INSTANCE_SIGNATURE").is_ok() {
+            cfg_if! {
+                if #[cfg(feature = "workspaces+hyprland")] { Self::Hyprland}
+                else { tracing::error!("Not compiled with Hyprland support"); Self::Unsupported }
+            }
+        } else {
+            Self::Unsupported
+        }
+    }
+
+    /// Gets the workspace client for the current compositor
+    pub fn get_workspace_client() -> Result<&'static (dyn WorkspaceClient + Send)> {
+        let current = Self::get_current();
+        debug!("Getting workspace client for: {current}");
+        match current {
+            #[cfg(feature = "workspaces+sway")]
+            Self::Sway => Ok(sway::get_sub_client()),
+            #[cfg(feature = "workspaces+hyprland")]
+            Self::Hyprland => Ok(hyprland::get_client()),
+            Self::Unsupported => Err(Report::msg("Unsupported compositor")
+                .note("Currently workspaces are only supported by Sway and Hyprland")),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Workspace {
+    /// Unique identifier
+    pub id: String,
+    /// Workspace friendly name
+    pub name: String,
+    /// Name of the monitor (output) the workspace is located on
+    pub monitor: String,
+    /// Whether the workspace is in focus
+    pub focused: bool,
+}
+
+#[derive(Debug, Clone)]
+pub enum WorkspaceUpdate {
+    /// Provides an initial list of workspaces.
+    /// This is re-sent to all subscribers when a new subscription is created.
+    Init(Vec<Workspace>),
+    Add(Workspace),
+    Remove(String),
+    Update(Workspace),
+    Move(Workspace),
+    /// Declares focus moved from the old workspace to the new.
+    Focus {
+        old: String,
+        new: String,
+    },
+}
+
+pub trait WorkspaceClient {
+    /// Requests the workspace with this name is focused.
+    fn focus(&self, name: String) -> Result<()>;
+
+    /// Creates a new to workspace event receiver.
+    fn subscribe_workspace_change(&self) -> broadcast::Receiver<WorkspaceUpdate>;
+}
--- a/src/clients/compositor/sway.rs
+++ b/src/clients/compositor/sway.rs
@@ -0,0 +1,159 @@
+use super::{Workspace, WorkspaceClient, WorkspaceUpdate};
+use crate::{await_sync, send};
+use async_once::AsyncOnce;
+use color_eyre::Report;
+use futures_util::StreamExt;
+use lazy_static::lazy_static;
+use std::sync::Arc;
+use swayipc_async::{Connection, Event, EventType, Node, WorkspaceChange, WorkspaceEvent};
+use tokio::spawn;
+use tokio::sync::broadcast::{channel, Receiver, Sender};
+use tokio::sync::Mutex;
+use tracing::{info, trace};
+
+pub struct SwayEventClient {
+    workspace_tx: Sender<WorkspaceUpdate>,
+    _workspace_rx: Receiver<WorkspaceUpdate>,
+}
+
+impl SwayEventClient {
+    fn new() -> Self {
+        let (workspace_tx, workspace_rx) = channel(16);
+
+        {
+            let workspace_tx = workspace_tx.clone();
+            spawn(async move {
+                let client = Connection::new().await?;
+                info!("Sway IPC subscription client connected");
+
+                let event_types = [EventType::Workspace];
+
+                let mut events = client.subscribe(event_types).await?;
+
+                while let Some(event) = events.next().await {
+                    trace!("event: {:?}", event);
+                    if let Event::Workspace(ev) = event? {
+                        workspace_tx.send(WorkspaceUpdate::from(*ev))?;
+                    };
+                }
+
+                Ok::<(), Report>(())
+            });
+        }
+
+        Self {
+            workspace_tx,
+            _workspace_rx: workspace_rx,
+        }
+    }
+}
+
+impl WorkspaceClient for SwayEventClient {
+    fn focus(&self, id: String) -> color_eyre::Result<()> {
+        await_sync(async move {
+            let client = get_client().await;
+            let mut client = client.lock().await;
+            client.run_command(format!("workspace {id}")).await
+        })?;
+        Ok(())
+    }
+
+    fn subscribe_workspace_change(&self) -> Receiver<WorkspaceUpdate> {
+        let rx = self.workspace_tx.subscribe();
+
+        {
+            let tx = self.workspace_tx.clone();
+            await_sync(async {
+                let client = get_client().await;
+                let mut client = client.lock().await;
+
+                let workspaces = client
+                    .get_workspaces()
+                    .await
+                    .expect("Failed to get workspaces");
+                let event =
+                    WorkspaceUpdate::Init(workspaces.into_iter().map(Workspace::from).collect());
+
+                send!(tx, event);
+            });
+        }
+
+        rx
+    }
+}
+
+lazy_static! {
+    static ref CLIENT: AsyncOnce<Arc<Mutex<Connection>>> = AsyncOnce::new(async {
+        let client = Connection::new()
+            .await
+            .expect("Failed to connect to Sway socket");
+        Arc::new(Mutex::new(client))
+    });
+    static ref SUB_CLIENT: SwayEventClient = SwayEventClient::new();
+}
+
+/// Gets the sway IPC client
+async fn get_client() -> Arc<Mutex<Connection>> {
+    let client = CLIENT.get().await;
+    Arc::clone(client)
+}
+
+/// Gets the sway IPC event subscription client
+pub fn get_sub_client() -> &'static SwayEventClient {
+    &SUB_CLIENT
+}
+
+impl From<Node> for Workspace {
+    fn from(node: Node) -> Self {
+        Self {
+            id: node.id.to_string(),
+            name: node.name.unwrap_or_default(),
+            monitor: node.output.unwrap_or_default(),
+            focused: node.focused,
+        }
+    }
+}
+
+impl From<swayipc_async::Workspace> for Workspace {
+    fn from(workspace: swayipc_async::Workspace) -> Self {
+        Self {
+            id: workspace.id.to_string(),
+            name: workspace.name,
+            monitor: workspace.output,
+            focused: workspace.focused,
+        }
+    }
+}
+
+impl From<WorkspaceEvent> for WorkspaceUpdate {
+    fn from(event: WorkspaceEvent) -> Self {
+        match event.change {
+            WorkspaceChange::Init => {
+                Self::Add(event.current.expect("Missing current workspace").into())
+            }
+            WorkspaceChange::Empty => Self::Remove(
+                event
+                    .current
+                    .expect("Missing current workspace")
+                    .name
+                    .unwrap_or_default(),
+            ),
+            WorkspaceChange::Focus => Self::Focus {
+                old: event
+                    .old
+                    .expect("Missing old workspace")
+                    .name
+                    .unwrap_or_default(),
+                new: event
+                    .current
+                    .expect("Missing current workspace")
+                    .name
+                    .unwrap_or_default(),
+            },
+            WorkspaceChange::Move => {
+                Self::Move(event.current.expect("Missing current workspace").into())
+            }
+            _ => Self::Update(event.current.expect("Missing current workspace").into()),
+        }
+    }
+}
--- a/src/clients/mod.rs
+++ b/src/clients/mod.rs
@@ -1,4 +1,11 @@
-pub mod mpd;
-pub mod sway;
+#[cfg(feature = "clipboard")]
+pub mod clipboard;
+#[cfg(feature = "workspaces")]
+pub mod compositor;
+#[cfg(feature = "music")]
+pub mod music;
+#[cfg(feature = "tray")]
 pub mod system_tray;
 pub mod wayland;
+#[cfg(feature = "volume")]
+pub mod volume;
--- a/src/clients/mpd.rs
+++ b/src/clients/mpd.rs
@@ -1,167 +0,0 @@
-use lazy_static::lazy_static;
-use mpd_client::client::{CommandError, Connection, ConnectionEvent, Subsystem};
-use mpd_client::commands::Command;
-use mpd_client::protocol::MpdProtocolError;
-use mpd_client::responses::Status;
-use mpd_client::Client;
-use std::collections::HashMap;
-use std::fmt::{Display, Formatter};
-use std::os::unix::fs::FileTypeExt;
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::time::Duration;
-use tokio::net::{TcpStream, UnixStream};
-use tokio::spawn;
-use tokio::sync::broadcast::{channel, error::SendError, Receiver, Sender};
-use tokio::sync::Mutex;
-use tokio::time::sleep;
-use tracing::debug;
-
-lazy_static! {
-    static ref CONNECTIONS: Arc<Mutex<HashMap<String, Arc<MpdClient>>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-}
-
-pub struct MpdClient {
-    client: Client,
-    tx: Sender<()>,
-    _rx: Receiver<()>,
-}
-
-#[derive(Debug)]
-pub enum MpdConnectionError {
-    MaxRetries,
-    ProtocolError(MpdProtocolError),
-}
-
-impl Display for MpdConnectionError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::MaxRetries => write!(f, "Reached max retries"),
-            Self::ProtocolError(e) => write!(f, "{:?}", e),
-        }
-    }
-}
-
-impl std::error::Error for MpdConnectionError {}
-
-impl MpdClient {
-    async fn new(host: &str) -> Result<Self, MpdConnectionError> {
-        debug!("Creating new MPD connection to {}", host);
-
-        let (client, mut state_changes) =
-            wait_for_connection(host, Duration::from_secs(5), None).await?;
-
-        let (tx, rx) = channel(16);
-        let tx2 = tx.clone();
-
-        spawn(async move {
-            while let Some(change) = state_changes.next().await {
-                debug!("Received state change: {:?}", change);
-
-                if let ConnectionEvent::SubsystemChange(
-                    Subsystem::Player | Subsystem::Queue | Subsystem::Mixer,
-                ) = change
-                {
-                    tx2.send(())?;
-                }
-            }
-
-            Ok::<(), SendError<()>>(())
-        });
-
-        Ok(Self {
-            client,
-            tx,
-            _rx: rx,
-        })
-    }
-
-    pub fn subscribe(&self) -> Receiver<()> {
-        self.tx.subscribe()
-    }
-
-    pub async fn command<C: Command>(&self, command: C) -> Result<C::Response, CommandError> {
-        self.client.command(command).await
-    }
-}
-
-pub async fn get_client(host: &str) -> Result<Arc<MpdClient>, MpdConnectionError> {
-    let mut connections = CONNECTIONS.lock().await;
-    match connections.get(host) {
-        None => {
-            let client = MpdClient::new(host).await?;
-            let client = Arc::new(client);
-            connections.insert(host.to_string(), Arc::clone(&client));
-            Ok(client)
-        }
-        Some(client) => Ok(Arc::clone(client)),
-    }
-}
-
-async fn wait_for_connection(
-    host: &str,
-    interval: Duration,
-    max_retries: Option<usize>,
-) -> Result<Connection, MpdConnectionError> {
-    let mut retries = 0;
-    let max_retries = max_retries.unwrap_or(usize::MAX);
-
-    loop {
-        if retries == max_retries {
-            break Err(MpdConnectionError::MaxRetries);
-        }
-
-        retries += 1;
-
-        match try_get_mpd_conn(host).await {
-            Ok(conn) => break Ok(conn),
-            Err(err) => {
-                if retries == max_retries {
-                    break Err(MpdConnectionError::ProtocolError(err));
-                }
-            }
-        }
-
-        sleep(interval).await;
-    }
-}
-
-/// Cycles through each MPD host and
-/// returns the first one which connects,
-/// or none if there are none
-async fn try_get_mpd_conn(host: &str) -> Result<Connection, MpdProtocolError> {
-    if is_unix_socket(host) {
-        connect_unix(host).await
-    } else {
-        connect_tcp(host).await
-    }
-}
-
-fn is_unix_socket(host: &str) -> bool {
-    let path = PathBuf::from(host);
-    path.exists()
-        && path
-            .metadata()
-            .map_or(false, |metadata| metadata.file_type().is_socket())
-}
-
-async fn connect_unix(host: &str) -> Result<Connection, MpdProtocolError> {
-    let connection = UnixStream::connect(host).await?;
-    Client::connect(connection).await
-}
-
-async fn connect_tcp(host: &str) -> Result<Connection, MpdProtocolError> {
-    let connection = TcpStream::connect(host).await?;
-    Client::connect(connection).await
-}
-
-/// Gets the duration of the current song
-pub fn get_duration(status: &Status) -> Option<u64> {
-    status.duration.map(|duration| duration.as_secs())
-}
-
-/// Gets the elapsed time of the current song
-pub fn get_elapsed(status: &Status) -> Option<u64> {
-    status.elapsed.map(|duration| duration.as_secs())
-}
--- a/src/clients/music/mod.rs
+++ b/src/clients/music/mod.rs
@@ -0,0 +1,72 @@
+use color_eyre::Result;
+use std::path::PathBuf;
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::sync::broadcast;
+
+#[cfg(feature = "music+mpd")]
+pub mod mpd;
+#[cfg(feature = "music+mpris")]
+pub mod mpris;
+
+#[derive(Clone, Debug)]
+pub enum PlayerUpdate {
+    Update(Box<Option<Track>>, Status),
+    Disconnect,
+}
+
+#[derive(Clone, Debug)]
+pub struct Track {
+    pub title: Option<String>,
+    pub album: Option<String>,
+    pub artist: Option<String>,
+    pub date: Option<String>,
+    pub disc: Option<u64>,
+    pub genre: Option<String>,
+    pub track: Option<u64>,
+    pub cover_path: Option<String>,
+}
+
+#[derive(Clone, Debug)]
+pub enum PlayerState {
+    Playing,
+    Paused,
+    Stopped,
+}
+
+#[derive(Clone, Debug)]
+pub struct Status {
+    pub state: PlayerState,
+    pub volume_percent: u8,
+    pub duration: Option<Duration>,
+    pub elapsed: Option<Duration>,
+    pub playlist_position: u32,
+    pub playlist_length: u32,
+}
+
+pub trait MusicClient {
+    fn play(&self) -> Result<()>;
+    fn pause(&self) -> Result<()>;
+    fn next(&self) -> Result<()>;
+    fn prev(&self) -> Result<()>;
+
+    fn set_volume_percent(&self, vol: u8) -> Result<()>;
+
+    fn subscribe_change(&self) -> broadcast::Receiver<PlayerUpdate>;
+}
+
+pub enum ClientType<'a> {
+    Mpd { host: &'a str, music_dir: PathBuf },
+    Mpris,
+}
+
+pub async fn get_client(client_type: ClientType<'_>) -> Box<Arc<dyn MusicClient>> {
+    match client_type {
+        ClientType::Mpd { host, music_dir } => Box::new(
+            mpd::get_client(host, music_dir)
+                .await
+                .expect("Failed to connect to MPD client"),
+        ),
+        ClientType::Mpris => Box::new(mpris::get_client()),
+    }
+}
--- a/src/clients/music/mpd.rs
+++ b/src/clients/music/mpd.rs
@@ -0,0 +1,311 @@
+use super::{MusicClient, Status, Track};
+use crate::await_sync;
+use crate::clients::music::{PlayerState, PlayerUpdate};
+use color_eyre::Result;
+use lazy_static::lazy_static;
+use mpd_client::client::{Connection, ConnectionEvent, Subsystem};
+use mpd_client::protocol::MpdProtocolError;
+use mpd_client::responses::{PlayState, Song};
+use mpd_client::tag::Tag;
+use mpd_client::{commands, Client};
+use std::collections::HashMap;
+use std::fmt::{Display, Formatter};
+use std::os::unix::fs::FileTypeExt;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::net::{TcpStream, UnixStream};
+use tokio::spawn;
+use tokio::sync::broadcast::{channel, error::SendError, Receiver, Sender};
+use tokio::sync::Mutex;
+use tokio::time::sleep;
+use tracing::{debug, error, info};
+
+lazy_static! {
+    static ref CONNECTIONS: Arc<Mutex<HashMap<String, Arc<MpdClient>>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+}
+
+pub struct MpdClient {
+    client: Client,
+    music_dir: PathBuf,
+    tx: Sender<PlayerUpdate>,
+    _rx: Receiver<PlayerUpdate>,
+}
+
+#[derive(Debug)]
+pub enum MpdConnectionError {
+    MaxRetries,
+    ProtocolError(MpdProtocolError),
+}
+
+impl Display for MpdConnectionError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::MaxRetries => write!(f, "Reached max retries"),
+            Self::ProtocolError(e) => write!(f, "{e:?}"),
+        }
+    }
+}
+
+impl std::error::Error for MpdConnectionError {}
+
+impl MpdClient {
+    async fn new(host: &str, music_dir: PathBuf) -> Result<Self, MpdConnectionError> {
+        debug!("Creating new MPD connection to {}", host);
+
+        let (client, mut state_changes) =
+            wait_for_connection(host, Duration::from_secs(5), None).await?;
+
+        let (tx, rx) = channel(16);
+
+        {
+            let music_dir = music_dir.clone();
+            let tx = tx.clone();
+            let client = client.clone();
+
+            spawn(async move {
+                while let Some(change) = state_changes.next().await {
+                    debug!("Received state change: {:?}", change);
+
+                    if let ConnectionEvent::SubsystemChange(
+                        Subsystem::Player | Subsystem::Queue | Subsystem::Mixer,
+                    ) = change
+                    {
+                        Self::send_update(&client, &tx, &music_dir)
+                            .await
+                            .expect("Failed to send update");
+                    }
+                }
+
+                Ok::<(), SendError<(Option<Track>, Status)>>(())
+            });
+        }
+
+        Ok(Self {
+            client,
+            music_dir,
+            tx,
+            _rx: rx,
+        })
+    }
+
+    async fn send_update(
+        client: &Client,
+        tx: &Sender<PlayerUpdate>,
+        music_dir: &Path,
+    ) -> Result<(), SendError<PlayerUpdate>> {
+        let current_song = client.command(commands::CurrentSong).await;
+        let status = client.command(commands::Status).await;
+
+        if let (Ok(current_song), Ok(status)) = (current_song, status) {
+            let track = current_song.map(|s| Self::convert_song(&s.song, music_dir));
+            let status = Status::from(status);
+
+            tx.send(PlayerUpdate::Update(Box::new(track), status))?;
+        }
+
+        Ok(())
+    }
+
+    fn is_connected(&self) -> bool {
+        !self.client.is_connection_closed()
+    }
+
+    fn send_disconnect_update(&self) -> Result<(), SendError<PlayerUpdate>> {
+        info!("Connection to MPD server lost");
+        self.tx.send(PlayerUpdate::Disconnect)?;
+        Ok(())
+    }
+
+    fn convert_song(song: &Song, music_dir: &Path) -> Track {
+        let (track, disc) = song.number();
+
+        let cover_path = music_dir
+            .join(
+                song.file_path()
+                    .parent()
+                    .expect("Song path should not be root")
+                    .join("cover.jpg"),
+            )
+            .into_os_string()
+            .into_string()
+            .ok();
+
+        Track {
+            title: song.title().map(std::string::ToString::to_string),
+            album: song.album().map(std::string::ToString::to_string),
+            artist: Some(song.artists().join(", ")),
+            date: try_get_first_tag(song, &Tag::Date).map(std::string::ToString::to_string),
+            genre: try_get_first_tag(song, &Tag::Genre).map(std::string::ToString::to_string),
+            disc: Some(disc),
+            track: Some(track),
+            cover_path,
+        }
+    }
+}
+
+macro_rules! async_command {
+    ($client:expr, $command:expr) => {
+        await_sync(async {
+            $client
+                .command($command)
+                .await
+                .unwrap_or_else(|err| error!("Failed to send command: {err:?}"))
+        })
+    };
+}
+
+impl MusicClient for MpdClient {
+    fn play(&self) -> Result<()> {
+        async_command!(self.client, commands::SetPause(false));
+        Ok(())
+    }
+
+    fn pause(&self) -> Result<()> {
+        async_command!(self.client, commands::SetPause(true));
+        Ok(())
+    }
+
+    fn next(&self) -> Result<()> {
+        async_command!(self.client, commands::Next);
+        Ok(())
+    }
+
+    fn prev(&self) -> Result<()> {
+        async_command!(self.client, commands::Previous);
+        Ok(())
+    }
+
+    fn set_volume_percent(&self, vol: u8) -> Result<()> {
+        async_command!(self.client, commands::SetVolume(vol));
+        Ok(())
+    }
+
+    fn subscribe_change(&self) -> Receiver<PlayerUpdate> {
+        let rx = self.tx.subscribe();
+        await_sync(async {
+            Self::send_update(&self.client, &self.tx, &self.music_dir)
+                .await
+                .expect("Failed to send player update");
+        });
+        rx
+    }
+}
+
+pub async fn get_client(
+    host: &str,
+    music_dir: PathBuf,
+) -> Result<Arc<MpdClient>, MpdConnectionError> {
+    let mut connections = CONNECTIONS.lock().await;
+    match connections.get(host) {
+        None => {
+            let client = MpdClient::new(host, music_dir).await?;
+            let client = Arc::new(client);
+            connections.insert(host.to_string(), Arc::clone(&client));
+            Ok(client)
+        }
+        Some(client) => {
+            if client.is_connected() {
+                Ok(Arc::clone(client))
+            } else {
+                client
+                    .send_disconnect_update()
+                    .expect("Failed to send disconnect update");
+
+                let client = MpdClient::new(host, music_dir).await?;
+                let client = Arc::new(client);
+                connections.insert(host.to_string(), Arc::clone(&client));
+                Ok(client)
+            }
+        }
+    }
+}
+
+async fn wait_for_connection(
+    host: &str,
+    interval: Duration,
+    max_retries: Option<usize>,
+) -> Result<Connection, MpdConnectionError> {
+    let mut retries = 0;
+    let max_retries = max_retries.unwrap_or(usize::MAX);
+
+    loop {
+        if retries == max_retries {
+            break Err(MpdConnectionError::MaxRetries);
+        }
+
+        retries += 1;
+
+        match try_get_mpd_conn(host).await {
+            Ok(conn) => break Ok(conn),
+            Err(err) => {
+                if retries == max_retries {
+                    break Err(MpdConnectionError::ProtocolError(err));
+                }
+            }
+        }
+
+        sleep(interval).await;
+    }
+}
+
+/// Cycles through each MPD host and
+/// returns the first one which connects,
+/// or none if there are none
+async fn try_get_mpd_conn(host: &str) -> Result<Connection, MpdProtocolError> {
+    if is_unix_socket(host) {
+        connect_unix(host).await
+    } else {
+        connect_tcp(host).await
+    }
+}
+
+fn is_unix_socket(host: &str) -> bool {
+    let path = PathBuf::from(host);
+    path.exists()
+        && path
+            .metadata()
+            .map_or(false, |metadata| metadata.file_type().is_socket())
+}
+
+async fn connect_unix(host: &str) -> Result<Connection, MpdProtocolError> {
+    let connection = UnixStream::connect(host).await?;
+    Client::connect(connection).await
+}
+
+async fn connect_tcp(host: &str) -> Result<Connection, MpdProtocolError> {
+    let connection = TcpStream::connect(host).await?;
+    Client::connect(connection).await
+}
+
+/// Attempts to read the first value for a tag
+/// (since the MPD client returns a vector of tags, or None)
+pub fn try_get_first_tag<'a>(song: &'a Song, tag: &'a Tag) -> Option<&'a str> {
+    song.tags
+        .get(tag)
+        .and_then(|vec| vec.first().map(String::as_str))
+}
+
+impl From<mpd_client::responses::Status> for Status {
+    fn from(status: mpd_client::responses::Status) -> Self {
+        Self {
+            state: PlayerState::from(status.state),
+            volume_percent: status.volume,
+            duration: status.duration,
+            elapsed: status.elapsed,
+            playlist_position: status.current_song.map_or(0, |(pos, _)| pos.0 as u32),
+            playlist_length: status.playlist_length as u32,
+        }
+    }
+}
+
+impl From<PlayState> for PlayerState {
+    fn from(value: PlayState) -> Self {
+        match value {
+            PlayState::Stopped => Self::Stopped,
+            PlayState::Playing => Self::Playing,
+            PlayState::Paused => Self::Paused,
+        }
+    }
+}
--- a/src/clients/music/mpris.rs
+++ b/src/clients/music/mpris.rs
@@ -0,0 +1,275 @@
+use super::{MusicClient, PlayerUpdate, Status, Track};
+use crate::clients::music::PlayerState;
+use crate::{lock, send};
+use color_eyre::Result;
+use lazy_static::lazy_static;
+use mpris::{DBusError, Event, Metadata, PlaybackStatus, Player, PlayerFinder};
+use std::collections::HashSet;
+use std::sync::{Arc, Mutex};
+use std::thread::sleep;
+use std::time::Duration;
+use tokio::sync::broadcast::{channel, Receiver, Sender};
+use tokio::task::spawn_blocking;
+use tracing::{debug, error, trace};
+
+lazy_static! {
+    static ref CLIENT: Arc<Client> = Arc::new(Client::new());
+}
+
+pub struct Client {
+    current_player: Arc<Mutex<Option<String>>>,
+    tx: Sender<PlayerUpdate>,
+    _rx: Receiver<PlayerUpdate>,
+}
+
+impl Client {
+    fn new() -> Self {
+        let (tx, rx) = channel(32);
+
+        let current_player = Arc::new(Mutex::new(None));
+
+        {
+            let players_list = Arc::new(Mutex::new(HashSet::new()));
+            let current_player = current_player.clone();
+            let tx = tx.clone();
+
+            spawn_blocking(move || {
+                let player_finder = PlayerFinder::new().expect("Failed to connect to D-Bus");
+
+                // D-Bus gives no event for new players,
+                // so we have to keep polling the player list
+                loop {
+                    let players = player_finder
+                        .find_all()
+                        .expect("Failed to connect to D-Bus");
+
+                    let mut players_list_val = lock!(players_list);
+                    for player in players {
+                        let identity = player.identity();
+
+                        if !players_list_val.contains(identity) {
+                            debug!("Adding MPRIS player '{identity}'");
+                            players_list_val.insert(identity.to_string());
+
+                            let status = player
+                                .get_playback_status()
+                                .expect("Failed to connect to D-Bus");
+
+                            {
+                                let mut current_player = lock!(current_player);
+
+                                if status == PlaybackStatus::Playing || current_player.is_none() {
+                                    debug!("Setting active player to '{identity}'");
+
+                                    current_player.replace(identity.to_string());
+                                    if let Err(err) = Self::send_update(&player, &tx) {
+                                        error!("{err:?}");
+                                    }
+                                }
+                            }
+
+                            Self::listen_player_events(
+                                identity.to_string(),
+                                players_list.clone(),
+                                current_player.clone(),
+                                tx.clone(),
+                            );
+                        }
+                    }
+
+                    // wait 1 second before re-checking players
+                    sleep(Duration::from_secs(1));
+                }
+            });
+        }
+
+        Self {
+            current_player,
+            tx,
+            _rx: rx,
+        }
+    }
+
+    fn listen_player_events(
+        player_id: String,
+        players: Arc<Mutex<HashSet<String>>>,
+        current_player: Arc<Mutex<Option<String>>>,
+        tx: Sender<PlayerUpdate>,
+    ) {
+        spawn_blocking(move || {
+            let player_finder = PlayerFinder::new()?;
+
+            if let Ok(player) = player_finder.find_by_name(&player_id) {
+                let identity = player.identity();
+
+                for event in player.events()? {
+                    trace!("Received player event from '{identity}': {event:?}");
+                    match event {
+                        Ok(Event::PlayerShutDown) => {
+                            lock!(current_player).take();
+                            lock!(players).remove(identity);
+                            break;
+                        }
+                        Ok(Event::Playing) => {
+                            lock!(current_player).replace(identity.to_string());
+
+                            if let Err(err) = Self::send_update(&player, &tx) {
+                                error!("{err:?}");
+                            }
+                        }
+                        Ok(_) => {
+                            let current_player = lock!(current_player);
+                            let current_player = current_player.as_ref();
+                            if let Some(current_player) = current_player {
+                                if current_player == identity {
+                                    if let Err(err) = Self::send_update(&player, &tx) {
+                                        error!("{err:?}");
+                                    }
+                                }
+                            }
+                        }
+                        Err(err) => error!("{err:?}"),
+                    }
+                }
+            }
+
+            Ok::<(), DBusError>(())
+        });
+    }
+
+    fn send_update(player: &Player, tx: &Sender<PlayerUpdate>) -> Result<()> {
+        debug!("Sending update using '{}'", player.identity());
+
+        let metadata = player.get_metadata()?;
+        let playback_status = player
+            .get_playback_status()
+            .unwrap_or(PlaybackStatus::Stopped);
+
+        let track_list = player.get_track_list();
+
+        let volume_percent = player
+            .get_volume()
+            .map(|vol| (vol * 100.0) as u8)
+            .unwrap_or(0);
+
+        let status = Status {
+            // MRPIS doesn't seem to provide playlist info reliably,
+            // so we can just assume next/prev will work by bodging the numbers
+            playlist_position: 1,
+            playlist_length: track_list.map(|list| list.len() as u32).unwrap_or(u32::MAX),
+            state: PlayerState::from(playback_status),
+            elapsed: player.get_position().ok(),
+            duration: metadata.length(),
+            volume_percent,
+        };
+
+        let track = Track::from(metadata);
+
+        let player_update = PlayerUpdate::Update(Box::new(Some(track)), status);
+        send!(tx, player_update);
+
+        Ok(())
+    }
+
+    fn get_player(&self) -> Option<Player> {
+        let player_name = lock!(self.current_player);
+        let player_name = player_name.as_ref();
+
+        player_name.and_then(|player_name| {
+            let player_finder = PlayerFinder::new().expect("Failed to connect to D-Bus");
+            player_finder.find_by_name(player_name).ok()
+        })
+    }
+}
+
+macro_rules! command {
+    ($self:ident, $func:ident) => {
+        if let Some(player) = Self::get_player($self) {
+            player.$func()?;
+        } else {
+            error!("Could not find player");
+        }
+    };
+}
+
+impl MusicClient for Client {
+    fn play(&self) -> Result<()> {
+        command!(self, play);
+        Ok(())
+    }
+
+    fn pause(&self) -> Result<()> {
+        command!(self, pause);
+        Ok(())
+    }
+
+    fn next(&self) -> Result<()> {
+        command!(self, next);
+        Ok(())
+    }
+
+    fn prev(&self) -> Result<()> {
+        command!(self, previous);
+        Ok(())
+    }
+
+    fn set_volume_percent(&self, vol: u8) -> Result<()> {
+        if let Some(player) = Self::get_player(self) {
+            player.set_volume(vol as f64 / 100.0)?;
+        } else {
+            error!("Could not find player");
+        }
+        Ok(())
+    }
+
+    fn subscribe_change(&self) -> Receiver<PlayerUpdate> {
+        debug!("Creating new subscription");
+        let rx = self.tx.subscribe();
+
+        if let Some(player) = self.get_player() {
+            if let Err(err) = Self::send_update(&player, &self.tx) {
+                error!("{err:?}");
+            }
+        }
+
+        rx
+    }
+}
+
+pub fn get_client() -> Arc<Client> {
+    CLIENT.clone()
+}
+
+impl From<Metadata> for Track {
+    fn from(value: Metadata) -> Self {
+        const KEY_DATE: &str = "xesam:contentCreated";
+        const KEY_GENRE: &str = "xesam:genre";
+
+        Self {
+            title: value.title().map(std::string::ToString::to_string),
+            album: value.album_name().map(std::string::ToString::to_string),
+            artist: value.artists().map(|artists| artists.join(", ")),
+            date: value
+                .get(KEY_DATE)
+                .and_then(mpris::MetadataValue::as_string)
+                .map(std::string::ToString::to_string),
+            disc: value.disc_number().map(|disc| disc as u64),
+            genre: value
+                .get(KEY_GENRE)
+                .and_then(mpris::MetadataValue::as_str_array)
+                .and_then(|arr| arr.first().map(|val| (*val).to_string())),
+            track: value.track_number().map(|track| track as u64),
+            cover_path: value.art_url().map(|s| s.to_string()),
+        }
+    }
+}
+
+impl From<PlaybackStatus> for PlayerState {
+    fn from(value: PlaybackStatus) -> Self {
+        match value {
+            PlaybackStatus::Playing => Self::Playing,
+            PlaybackStatus::Paused => Self::Paused,
+            PlaybackStatus::Stopped => Self::Stopped,
+        }
+    }
+}
--- a/src/clients/sway.rs
+++ b/src/clients/sway.rs
@@ -1,74 +0,0 @@
-use async_once::AsyncOnce;
-use color_eyre::Report;
-use futures_util::StreamExt;
-use lazy_static::lazy_static;
-use std::sync::Arc;
-use swayipc_async::{Connection, Event, EventType, WorkspaceEvent};
-use tokio::spawn;
-use tokio::sync::broadcast::{channel, Receiver, Sender};
-use tokio::sync::Mutex;
-use tracing::{info, trace};
-
-pub struct SwayEventClient {
-    workspace_tx: Sender<Box<WorkspaceEvent>>,
-    _workspace_rx: Receiver<Box<WorkspaceEvent>>,
-}
-
-impl SwayEventClient {
-    fn new() -> Self {
-        let (workspace_tx, workspace_rx) = channel(16);
-
-        let workspace_tx2 = workspace_tx.clone();
-
-        spawn(async move {
-            let workspace_tx = workspace_tx2;
-
-            let client = Connection::new().await?;
-            info!("Sway IPC subscription client connected");
-
-            let event_types = [EventType::Workspace];
-
-            let mut events = client.subscribe(event_types).await?;
-
-            while let Some(event) = events.next().await {
-                trace!("event: {:?}", event);
-                if let Event::Workspace(ev) = event? {
-                    workspace_tx.send(ev)?;
-                };
-            }
-
-            Ok::<(), Report>(())
-        });
-
-        Self {
-            workspace_tx,
-            _workspace_rx: workspace_rx,
-        }
-    }
-
-    /// Gets an event receiver for workspace events
-    pub fn subscribe_workspace(&self) -> Receiver<Box<WorkspaceEvent>> {
-        self.workspace_tx.subscribe()
-    }
-}
-
-lazy_static! {
-    static ref CLIENT: AsyncOnce<Arc<Mutex<Connection>>> = AsyncOnce::new(async {
-        let client = Connection::new()
-            .await
-            .expect("Failed to connect to Sway socket");
-        Arc::new(Mutex::new(client))
-    });
-    static ref SUB_CLIENT: SwayEventClient = SwayEventClient::new();
-}
-
-/// Gets the sway IPC client
-pub async fn get_client() -> Arc<Mutex<Connection>> {
-    let client = CLIENT.get().await;
-    Arc::clone(client)
-}
-
-/// Gets the sway IPC event subscription client
-pub fn get_sub_client() -> &'static SwayEventClient {
-    &SUB_CLIENT
-}
--- a/src/clients/system_tray.rs
+++ b/src/clients/system_tray.rs
@@ -1,15 +1,25 @@
+use crate::{lock, send};
 use async_once::AsyncOnce;
+use color_eyre::Report;
 use lazy_static::lazy_static;
+use std::collections::BTreeMap;
+use std::sync::{Arc, Mutex};
+use stray::message::menu::TrayMenu;
+use stray::message::tray::StatusNotifierItem;
 use stray::message::{NotifierItemCommand, NotifierItemMessage};
 use stray::StatusNotifierWatcher;
 use tokio::spawn;
 use tokio::sync::{broadcast, mpsc};
-use tracing::debug;
+use tracing::error;
+
+type Tray = BTreeMap<String, (Box<StatusNotifierItem>, Option<TrayMenu>)>;

 pub struct TrayEventReceiver {
    tx: mpsc::Sender<NotifierItemCommand>,
    b_tx: broadcast::Sender<NotifierItemMessage>,
    _b_rx: broadcast::Receiver<NotifierItemMessage>,
+
+    tray: Arc<Mutex<Tray>>,
 }

 impl TrayEventReceiver {
@@ -20,19 +30,39 @@ impl TrayEventReceiver {
        let tray = StatusNotifierWatcher::new(rx).await?;
        let mut host = tray.create_notifier_host("ironbar").await?;

-        let b_tx2 = b_tx.clone();
-        spawn(async move {
-            while let Ok(message) = host.recv().await {
-                b_tx2.send(message)?;
-            }
+        let tray = Arc::new(Mutex::new(BTreeMap::new()));

-            Ok::<(), broadcast::error::SendError<NotifierItemMessage>>(())
-        });
+        {
+            let b_tx = b_tx.clone();
+            let tray = tray.clone();
+
+            spawn(async move {
+                while let Ok(message) = host.recv().await {
+                    send!(b_tx, message.clone());
+                    let mut tray = lock!(tray);
+                    match message {
+                        NotifierItemMessage::Update {
+                            address,
+                            item,
+                            menu,
+                        } => {
+                            tray.insert(address, (item, menu));
+                        }
+                        NotifierItemMessage::Remove { address } => {
+                            tray.remove(&address);
+                        }
+                    }
+                }
+
+                Ok::<(), broadcast::error::SendError<NotifierItemMessage>>(())
+            });
+        }

        Ok(Self {
            tx,
            b_tx,
            _b_rx: b_rx,
+            tray,
        })
    }

@@ -42,7 +72,20 @@ impl TrayEventReceiver {
        mpsc::Sender<NotifierItemCommand>,
        broadcast::Receiver<NotifierItemMessage>,
    ) {
-        (self.tx.clone(), self.b_tx.subscribe())
+        let tx = self.tx.clone();
+        let b_rx = self.b_tx.subscribe();
+
+        let tray = lock!(self.tray).clone();
+        for (address, (item, menu)) in tray {
+            let update = NotifierItemMessage::Update {
+                address,
+                item,
+                menu,
+            };
+            send!(self.b_tx, update);
+        }
+
+        (tx, b_rx)
    }
 }

@@ -58,11 +101,14 @@ lazy_static! {

            let tray = TrayEventReceiver::new().await;

-            if tray.is_ok() || retries == MAX_RETRIES {
-                break tray;
+            match tray {
+                Ok(tray) => break Some(tray),
+                Err(err) => error!("{:?}", Report::new(err).wrap_err(format!("Failed to create StatusNotifierWatcher (attempt {retries})")))
            }

-            debug!("Failed to create StatusNotifierWatcher (attempt {retries})");
+            if retries == MAX_RETRIES {
+                break None;
+            }
        };

        value.expect("Failed to create StatusNotifierWatcher")
--- a/src/clients/volume/mod.rs
+++ b/src/clients/volume/mod.rs
@@ -0,0 +1,9 @@
+#[cfg(feature = "volume+pulse")]
+pub mod pulse_bak;
+// #[cfg(feature = "volume+pulse")]
+// pub mod pulse;
+
+trait VolumeClient {
+    // TODO: Write
+}
+
--- a/src/clients/volume/pulse/callbacks.rs
+++ b/src/clients/volume/pulse/callbacks.rs
@@ -0,0 +1,345 @@
+use libpulse_binding::{
+	callbacks::ListResult,
+	context::{
+		introspect::{CardInfo, SinkInfo, SinkInputInfo, SourceInfo, SourceOutputInfo},
+		subscribe::{InterestMaskSet, Operation},
+	},
+	// def::{SinkState, SourceState},
+};
+use tracing::{debug, error, info};
+
+use super::{common::*, /*pa_interface::ACTIONS_SX*/};
+// use crate::{
+// 	entry::{CardProfile, Entry},
+// 	models::EntryUpdate,
+// 	ui::Rect,
+// };
+use color_eyre::Result;
+use crate::clients::volume::pulse::CardProfile;
+
+pub fn subscribe(
+	context: &Rc<RefCell<PAContext>>,
+	info_sx: mpsc::UnboundedSender<EntryIdentifier>,
+) -> Result<()> {
+	info!("[PAInterface] Registering pulseaudio callbacks");
+
+	context.borrow_mut().subscribe(
+		InterestMaskSet::SINK
+			| InterestMaskSet::SINK_INPUT
+			| InterestMaskSet::SOURCE
+			| InterestMaskSet::CARD
+			| InterestMaskSet::SOURCE_OUTPUT
+			| InterestMaskSet::CLIENT
+			| InterestMaskSet::SERVER,
+		|success: bool| {
+			assert!(success, "subscription failed");
+		},
+	);
+
+	context.borrow_mut().set_subscribe_callback(Some(Box::new(
+		move |facility, operation, index| {
+			if let Some(facility) = facility {
+				match facility {
+					Facility::Server | Facility::Client => {
+						error!("{:?} {:?}", facility, operation);
+						return;
+					}
+					_ => {}
+				};
+
+				let entry_type: EntryType = facility.into();
+				match operation {
+					Some(Operation::New) => {
+						info!("[PAInterface] New {:?}", entry_type);
+
+						info_sx
+							.send(EntryIdentifier::new(entry_type, index))
+							.unwrap();
+					}
+					Some(Operation::Changed) => {
+						info!("[PAInterface] {:?} changed", entry_type);
+						info_sx
+							.send(EntryIdentifier::new(entry_type, index))
+							.unwrap();
+					}
+					Some(Operation::Removed) => {
+						info!("[PAInterface] {:?} removed", entry_type);
+						// (*ACTIONS_SX)
+						// 	.get()
+						// 	.send(EntryUpdate::EntryRemoved(EntryIdentifier::new(
+						// 		entry_type, index,
+						// 	)))
+						// 	.unwrap();
+					}
+					_ => {}
+				};
+			};
+		},
+	)));
+
+	Ok(())
+}
+
+pub fn request_current_state(
+	context: Rc<RefCell<PAContext>>,
+	info_sxx: mpsc::UnboundedSender<EntryIdentifier>,
+) -> Result<()> {
+	info!("[PAInterface] Requesting starting state");
+
+	let introspector = context.borrow_mut().introspect();
+
+	let info_sx = info_sxx.clone();
+	introspector.get_sink_info_list(move |x: ListResult<&SinkInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sx
+				.clone()
+				.send(EntryIdentifier::new(EntryType::Sink, e.index));
+		}
+	});
+
+	let info_sx = info_sxx.clone();
+	introspector.get_sink_input_info_list(move |x: ListResult<&SinkInputInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::SinkInput, e.index));
+		}
+	});
+
+	let info_sx = info_sxx.clone();
+	introspector.get_source_info_list(move |x: ListResult<&SourceInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::Source, e.index));
+		}
+	});
+
+	let info_sx = info_sxx.clone();
+	introspector.get_source_output_info_list(move |x: ListResult<&SourceOutputInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::SourceOutput, e.index));
+		}
+	});
+
+	introspector.get_card_info_list(move |x: ListResult<&CardInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sxx.send(EntryIdentifier::new(EntryType::Card, e.index));
+		}
+	});
+
+	Ok(())
+}
+
+pub fn request_info(
+	ident: EntryIdentifier,
+	context: &Rc<RefCell<PAContext>>,
+	info_sx: mpsc::UnboundedSender<EntryIdentifier>,
+) {
+	let introspector = context.borrow_mut().introspect();
+	debug!(
+		"[PAInterface] Requesting info for {:?} {}",
+		ident.entry_type, ident.index
+	);
+	match ident.entry_type {
+		EntryType::SinkInput => {
+			introspector.get_sink_input_info(ident.index, on_sink_input_info(&info_sx));
+		}
+		EntryType::Sink => {
+			introspector.get_sink_info_by_index(ident.index, on_sink_info(&info_sx));
+		}
+		EntryType::SourceOutput => {
+			introspector.get_source_output_info(ident.index, on_source_output_info(&info_sx));
+		}
+		EntryType::Source => {
+			introspector.get_source_info_by_index(ident.index, on_source_info(&info_sx));
+		}
+		EntryType::Card => {
+			introspector.get_card_info_by_index(ident.index, on_card_info);
+		}
+	};
+}
+pub fn on_card_info(res: ListResult<&CardInfo>) {
+	if let ListResult::Item(i) = res {
+		let n = match i
+			.proplist
+			.get_str(libpulse_binding::proplist::properties::DEVICE_DESCRIPTION)
+		{
+			Some(s) => s,
+			None => String::from(""),
+		};
+		let profiles: Vec<CardProfile> = i
+			.profiles
+			.iter()
+			.filter_map(|p| {
+				p.name.clone().map(|n| CardProfile {
+					// area: Rect::default(),
+					is_selected: false,
+					name: n.to_string(),
+					description: match &p.description {
+						Some(s) => s.to_string(),
+						None => n.to_string(),
+					},
+					#[cfg(any(feature = "pa_v13"))]
+					available: p.available,
+				})
+			})
+			.collect();
+
+		let selected_profile = match &i.active_profile {
+			Some(x) => {
+				if let Some(n) = &x.name {
+					profiles.iter().position(|p| p.name == *n)
+				} else {
+					None
+				}
+			}
+			None => None,
+		};
+
+		// let ident = EntryIdentifier::new(EntryType::Card, i.index);
+		// let entry = Entry::new_card_entry(i.index, n, profiles, selected_profile);
+
+		// (*ACTIONS_SX)
+		// 	.get()
+		// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+		// 	.unwrap();
+	}
+}
+
+pub fn on_sink_info(
+	_sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> impl Fn(ListResult<&SinkInfo>) {
+	|res: ListResult<&SinkInfo>| {
+		if let ListResult::Item(i) = res {
+			debug!("[PADataInterface] Update {} sink info", i.index);
+			let name = match &i.description {
+				Some(name) => name.to_string(),
+				None => String::new(),
+			};
+			// let ident = EntryIdentifier::new(EntryType::Sink, i.index);
+			// let entry = Entry::new_play_entry(
+			// 	EntryType::Sink,
+			// 	i.index,
+			// 	name,
+			// 	None,
+			// 	i.mute,
+			// 	i.volume,
+			// 	Some(i.monitor_source),
+			// 	None,
+			// 	i.state == SinkState::Suspended,
+			// );
+
+			// (*ACTIONS_SX)
+			// 	.get()
+			// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+			// 	.unwrap();
+		}
+	}
+}
+
+pub fn on_sink_input_info(
+	sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> impl Fn(ListResult<&SinkInputInfo>) {
+	let info_sx = sx.clone();
+	move |res: ListResult<&SinkInputInfo>| {
+		if let ListResult::Item(i) = res {
+			debug!("[PADataInterface] Update {} sink input info", i.index);
+			let n = match i
+				.proplist
+				.get_str(libpulse_binding::proplist::properties::APPLICATION_NAME)
+			{
+				Some(s) => s,
+				None => match &i.name {
+					Some(s) => s.to_string(),
+					None => String::from(""),
+				},
+			};
+			// let ident = EntryIdentifier::new(EntryType::SinkInput, i.index);
+			//
+			// let entry = Entry::new_play_entry(
+			// 	EntryType::SinkInput,
+			// 	i.index,
+			// 	n,
+			// 	Some(i.sink),
+			// 	i.mute,
+			// 	i.volume,
+			// 	None,
+			// 	Some(i.sink),
+			// 	false,
+			// );
+
+			// (*ACTIONS_SX)
+			// 	.get()
+			// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+			// 	.unwrap();
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::Sink, i.sink));
+		}
+	}
+}
+
+pub fn on_source_info(
+	_sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> impl Fn(ListResult<&SourceInfo>) {
+	move |res: ListResult<&SourceInfo>| {
+		if let ListResult::Item(i) = res {
+			debug!("[PADataInterface] Update {} source info", i.index);
+			let name = match &i.description {
+				Some(name) => name.to_string(),
+				None => String::new(),
+			};
+			// let ident = EntryIdentifier::new(EntryType::Source, i.index);
+			// let entry = Entry::new_play_entry(
+			// 	EntryType::Source,
+			// 	i.index,
+			// 	name,
+			// 	None,
+			// 	i.mute,
+			// 	i.volume,
+			// 	Some(i.index),
+			// 	None,
+			// 	i.state == SourceState::Suspended,
+			// );
+
+			// (*ACTIONS_SX)
+			// 	.get()
+			// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+			// 	.unwrap();
+		}
+	}
+}
+
+pub fn on_source_output_info(
+	sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> impl Fn(ListResult<&SourceOutputInfo>) {
+	let info_sx = sx.clone();
+	move |res: ListResult<&SourceOutputInfo>| {
+		if let ListResult::Item(i) = res {
+			debug!("[PADataInterface] Update {} source output info", i.index);
+			let n = match i
+				.proplist
+				.get_str(libpulse_binding::proplist::properties::APPLICATION_NAME)
+			{
+				Some(s) => s,
+				None => String::from(""),
+			};
+			if n == "RsMixerContext" {
+				return;
+			}
+			// let ident = EntryIdentifier::new(EntryType::SourceOutput, i.index);
+			// let entry = Entry::new_play_entry(
+			// 	EntryType::SourceOutput,
+			// 	i.index,
+			// 	n,
+			// 	Some(i.source),
+			// 	i.mute,
+			// 	i.volume,
+			// 	Some(i.source),
+			// 	None,
+			// 	false,
+			// );
+
+			// (*ACTIONS_SX)
+			// 	.get()
+			// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+			// 	.unwrap();
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::Source, i.index));
+		}
+	}
+}
--- a/src/clients/volume/pulse/common.rs
+++ b/src/clients/volume/pulse/common.rs
@@ -0,0 +1,30 @@
+pub use std::{cell::RefCell, collections::HashMap, rc::Rc};
+
+pub use libpulse_binding::{
+	context::{subscribe::Facility, Context as PAContext},
+	mainloop::{api::Mainloop as MainloopTrait, threaded::Mainloop},
+	stream::Stream,
+};
+pub use tokio::sync::mpsc;
+
+pub use super::{monitor::Monitors, PAInternal, SPEC};
+// pub use crate::{
+// 	entry::{EntryIdentifier, EntryType},
+// 	models::{EntryUpdate, PulseAudioAction},
+// 	prelude::*,
+// };
+
+pub static LOGGING_MODULE: &str = "PAInterface";
+
+impl From<Facility> for EntryType {
+	fn from(fac: Facility) -> Self {
+		match fac {
+			Facility::Sink => EntryType::Sink,
+			Facility::Source => EntryType::Source,
+			Facility::SinkInput => EntryType::SinkInput,
+			Facility::SourceOutput => EntryType::SourceOutput,
+			Facility::Card => EntryType::Card,
+			_ => EntryType::Sink,
+		}
+	}
+}
--- a/src/clients/volume/pulse/errors.rs
+++ b/src/clients/volume/pulse/errors.rs
@@ -0,0 +1,17 @@
+// use thiserror::Error;
+//
+// use super::PAInternal;
+//
+// #[derive(Debug, Error)]
+// pub enum PAError {
+// 	#[error("cannot create pulseaudio mainloop")]
+// 	MainloopCreateError,
+// 	#[error("cannot connect pulseaudio mainloop")]
+// 	MainloopConnectError,
+// 	#[error("cannot create pulseaudio stream")]
+// 	StreamCreateError,
+// 	#[error("internal channel send error")]
+// 	ChannelError(#[from] cb_channel::SendError<PAInternal>),
+// 	#[error("pulseaudio disconnected")]
+// 	PulseAudioDisconnected,
+// }
--- a/src/clients/volume/pulse/mod.rs
+++ b/src/clients/volume/pulse/mod.rs
@@ -0,0 +1,36 @@
+mod callbacks;
+pub mod common;
+mod errors;
+mod monitor;
+mod pa_actions;
+mod pa_interface;
+
+use common::*;
+use lazy_static::lazy_static;
+pub use pa_interface::start;
+
+#[derive(Debug)]
+pub enum PAInternal {
+	Tick,
+	Command(Box<PulseAudioAction>),
+	AskInfo(EntryIdentifier),
+}
+
+lazy_static! {
+	pub static ref SPEC: libpulse_binding::sample::Spec = libpulse_binding::sample::Spec {
+		format: libpulse_binding::sample::Format::FLOAT32NE,
+		channels: 1,
+		rate: 1024,
+	};
+}
+
+#[derive(PartialEq, Clone, Debug)]
+pub struct CardProfile {
+	pub name: String,
+	pub description: String,
+	#[cfg(any(feature = "pa_v13"))]
+	pub available: bool,
+	// pub area: Rect,
+	pub is_selected: bool,
+}
+impl Eq for CardProfile {}
--- a/src/clients/volume/pulse/monitor.rs
+++ b/src/clients/volume/pulse/monitor.rs
@@ -0,0 +1,278 @@
+use std::convert::TryInto;
+
+use libpulse_binding::stream::PeekResult;
+use tracing::{debug, error, info, warn};
+
+use super::{common::*, /*pa_interface::ACTIONS_SX*/};
+// use crate::VARIABLES;
+use color_eyre::{Report, Result};
+
+pub struct Monitor {
+    stream: Rc<RefCell<Stream>>,
+    exit_sender: mpsc::UnboundedSender<u32>,
+}
+
+pub struct Monitors {
+    monitors: HashMap<EntryIdentifier, Monitor>,
+    errors: HashMap<EntryIdentifier, usize>,
+}
+
+impl Default for Monitors {
+    fn default() -> Self {
+        Self {
+            monitors: HashMap::new(),
+            errors: HashMap::new(),
+        }
+    }
+}
+
+impl Monitors {
+    pub fn filter(
+        &mut self,
+        mainloop: &Rc<RefCell<Mainloop>>,
+        context: &Rc<RefCell<PAContext>>,
+        targets: &HashMap<EntryIdentifier, Option<u32>>,
+    ) {
+        // remove failed streams
+        // then send exit signal if stream is unwanted
+        self.monitors.retain(|ident, monitor| {
+            match monitor.stream.borrow_mut().get_state() {
+                libpulse_binding::stream::State::Terminated
+                | libpulse_binding::stream::State::Failed => {
+                    info!(
+                        "[PAInterface] Disconnecting {} sink input monitor (failed state)",
+                        ident.index
+                    );
+                    return false;
+                }
+                _ => {}
+            };
+
+            if targets.get(ident) == None {
+                let _ = monitor.exit_sender.send(0);
+            }
+
+            true
+        });
+
+        targets.iter().for_each(|(ident, monitor_src)| {
+            if self.monitors.get(ident).is_none() {
+                self.create_monitor(mainloop, context, *ident, *monitor_src);
+            }
+        });
+    }
+
+    fn create_monitor(
+        &mut self,
+        mainloop: &Rc<RefCell<Mainloop>>,
+        context: &Rc<RefCell<PAContext>>,
+        ident: EntryIdentifier,
+        monitor_src: Option<u32>,
+    ) {
+        if let Some(count) = self.errors.get(&ident) {
+            if *count >= 5 {
+                self.errors.remove(&ident);
+                // (*ACTIONS_SX)
+                //     .get()
+                //     .send(EntryUpdate::EntryRemoved(ident))
+                //     .unwrap();
+            }
+        }
+        if self.monitors.contains_key(&ident) {
+            return;
+        }
+        let (sx, rx) = mpsc::unbounded_channel();
+        if let Ok(stream) = create(
+            &mainloop,
+            &context,
+            &libpulse_binding::sample::Spec {
+                format: libpulse_binding::sample::Format::FLOAT32NE,
+                channels: 1,
+                rate: /*(*VARIABLES).get().pa_rate*/ 20,
+            },
+            ident,
+            monitor_src,
+            rx,
+        ) {
+            self.monitors.insert(
+                ident,
+                Monitor {
+                    stream,
+                    exit_sender: sx,
+                },
+            );
+            self.errors.remove(&ident);
+        } else {
+            self.error(&ident);
+        }
+    }
+
+    fn error(&mut self, ident: &EntryIdentifier) {
+        let count = match self.errors.get(&ident) {
+            Some(x) => *x,
+            None => 0,
+        };
+        self.errors.insert(*ident, count + 1);
+    }
+}
+
+fn slice_to_4_bytes(slice: &[u8]) -> [u8; 4] {
+    slice.try_into().expect("slice with incorrect length")
+}
+
+fn create(
+    p_mainloop: &Rc<RefCell<Mainloop>>,
+    p_context: &Rc<RefCell<PAContext>>,
+    p_spec: &libpulse_binding::sample::Spec,
+    ident: EntryIdentifier,
+    source_index: Option<u32>,
+    mut close_rx: mpsc::UnboundedReceiver<u32>,
+) -> Result<Rc<RefCell<Stream>>> {
+    info!("[PADataInterface] Attempting to create new monitor stream");
+
+    let stream_index = if ident.entry_type == EntryType::SinkInput {
+        Some(ident.index)
+    } else {
+        None
+    };
+
+    let stream = Rc::new(RefCell::new(
+        match Stream::new(&mut p_context.borrow_mut(), "RsMixer monitor", p_spec, None) {
+            Some(stream) => stream,
+            None => return Err(Report::msg("Error creating stream for monitoring volume")),
+        },
+    ));
+
+    // Stream state change callback
+    {
+        debug!("[PADataInterface] Registering stream state change callback");
+        let ml_ref = Rc::clone(&p_mainloop);
+        let stream_ref = Rc::downgrade(&stream);
+        stream
+            .borrow_mut()
+            .set_state_callback(Some(Box::new(move || {
+                let state = unsafe { (*(*stream_ref.as_ptr()).as_ptr()).get_state() };
+                match state {
+                    libpulse_binding::stream::State::Ready
+                    | libpulse_binding::stream::State::Failed
+                    | libpulse_binding::stream::State::Terminated => {
+                        unsafe { (*ml_ref.as_ptr()).signal(false) };
+                    }
+                    _ => {}
+                }
+            })));
+    }
+
+    // for sink inputs we want to set monitor stream to sink
+    if let Some(index) = stream_index {
+        stream.borrow_mut().set_monitor_stream(index).unwrap();
+    }
+
+    let x;
+    let mut s = None;
+    if let Some(i) = source_index {
+        x = i.to_string();
+        s = Some(x.as_str());
+    }
+
+    debug!("[PADataInterface] Connecting stream");
+    match stream.borrow_mut().connect_record(
+        s,
+        Some(&libpulse_binding::def::BufferAttr {
+            maxlength: std::u32::MAX,
+            tlength: std::u32::MAX,
+            prebuf: std::u32::MAX,
+            minreq: 0,
+            fragsize: /*(*VARIABLES).get().pa_frag_size*/ 48,
+        }),
+        libpulse_binding::stream::FlagSet::PEAK_DETECT
+            | libpulse_binding::stream::FlagSet::ADJUST_LATENCY,
+    ) {
+        Ok(_) => {}
+        Err(err) => {
+            return Err(Report::new(err).wrap_err("while connecting stream for monitoring volume"));
+        }
+    };
+
+    debug!("[PADataInterface] Waiting for stream to be ready");
+    loop {
+        match stream.borrow_mut().get_state() {
+            libpulse_binding::stream::State::Ready => {
+                break;
+            }
+            libpulse_binding::stream::State::Failed
+            | libpulse_binding::stream::State::Terminated => {
+                error!("[PADataInterface] Stream state failed/terminated");
+                return Err(Report::msg("Stream terminated"))
+            }
+            _ => {
+                p_mainloop.borrow_mut().wait();
+            }
+        }
+    }
+
+    stream.borrow_mut().set_state_callback(None);
+
+    {
+        info!("[PADataInterface] Registering stream read callback");
+        let ml_ref = Rc::clone(&p_mainloop);
+        let stream_ref = Rc::downgrade(&stream);
+        stream.borrow_mut().set_read_callback(Some(Box::new(move |_size: usize| {
+            let remove_failed = || {
+                error!("[PADataInterface] Monitor failed or terminated");
+            };
+            let disconnect_stream = || {
+                warn!("[PADataInterface] {:?} Monitor existed while the sink (input)/source (output) was already gone", ident);
+                unsafe {
+                    (*(*stream_ref.as_ptr()).as_ptr()).disconnect().unwrap();
+                    (*ml_ref.as_ptr()).signal(false);
+                };
+            };
+
+            if close_rx.try_recv().is_ok() {
+                disconnect_stream();
+                return;
+            }
+
+            match unsafe {(*(*stream_ref.as_ptr()).as_ptr()).get_state() }{
+                libpulse_binding::stream::State::Failed => {
+                    remove_failed();
+                },
+                libpulse_binding::stream::State::Terminated => {
+                    remove_failed();
+                },
+                libpulse_binding::stream::State::Ready => {
+                    match unsafe{ (*(*stream_ref.as_ptr()).as_ptr()).peek() } {
+                        Ok(res) => match res {
+                            PeekResult::Data(data) => {
+                                let count = data.len() / 4;
+                                let mut peak = 0.0;
+                                for c in 0..count {
+                                    let data_slice = slice_to_4_bytes(&data[c * 4 .. (c + 1) * 4]);
+                                    peak += f32::from_ne_bytes(data_slice).abs();
+                                }
+                                peak = peak / count as f32;
+
+                                // if (*ACTIONS_SX).get().send(EntryUpdate::PeakVolumeUpdate(ident, peak)).is_err() {
+                                //     disconnect_stream();
+                                // }
+
+                                unsafe { (*(*stream_ref.as_ptr()).as_ptr()).discard().unwrap(); };
+                            },
+                            PeekResult::Hole(_) => {
+                                unsafe { (*(*stream_ref.as_ptr()).as_ptr()).discard().unwrap(); };
+                            },
+                            _ => {},
+                        },
+                        Err(_) => {
+                            remove_failed();
+                        },
+                    }
+                },
+                _ => {},
+            };
+        })));
+    }
+
+    Ok(stream)
+}
--- a/src/clients/volume/pulse/pa_actions.rs
+++ b/src/clients/volume/pulse/pa_actions.rs
@@ -0,0 +1,148 @@
+use super::{callbacks, common::*};
+
+pub fn handle_command(
+	cmd: PulseAudioAction,
+	context: &Rc<RefCell<PAContext>>,
+	info_sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> Option<()> {
+	match cmd {
+		PulseAudioAction::RequestPulseAudioState => {
+			callbacks::request_current_state(Rc::clone(&context), info_sx.clone()).unwrap();
+		}
+		PulseAudioAction::MuteEntry(ident, mute) => {
+			set_mute(ident, mute, &context);
+		}
+		PulseAudioAction::MoveEntryToParent(ident, parent) => {
+			move_entry_to_parent(ident, parent, &context, info_sx.clone());
+		}
+		PulseAudioAction::ChangeCardProfile(ident, profile) => {
+			change_card_profile(ident, profile, &context);
+		}
+		PulseAudioAction::SetVolume(ident, vol) => {
+			set_volume(ident, vol, &context);
+		}
+		PulseAudioAction::SetSuspend(ident, suspend) => {
+			set_suspend(ident, suspend, &context);
+		}
+		PulseAudioAction::KillEntry(ident) => {
+			kill_entry(ident, &context);
+		}
+		PulseAudioAction::Shutdown => {
+			//@TODO disconnect monitors
+			return None;
+		}
+		_ => {}
+	};
+	Some(())
+}
+
+fn set_volume(
+	ident: EntryIdentifier,
+	vol: libpulse_binding::volume::ChannelVolumes,
+	context: &Rc<RefCell<PAContext>>,
+) {
+	let mut introspector = context.borrow_mut().introspect();
+	match ident.entry_type {
+		EntryType::Sink => {
+			introspector.set_sink_volume_by_index(ident.index, &vol, None);
+		}
+		EntryType::SinkInput => {
+			introspector.set_sink_input_volume(ident.index, &vol, None);
+		}
+		EntryType::Source => {
+			introspector.set_source_volume_by_index(ident.index, &vol, None);
+		}
+		EntryType::SourceOutput => {
+			introspector.set_source_output_volume(ident.index, &vol, None);
+		}
+		_ => {}
+	};
+}
+
+fn change_card_profile(ident: EntryIdentifier, profile: String, context: &Rc<RefCell<PAContext>>) {
+	if ident.entry_type != EntryType::Card {
+		return;
+	}
+	context
+		.borrow_mut()
+		.introspect()
+		.set_card_profile_by_index(ident.index, &profile[..], None);
+}
+
+fn move_entry_to_parent(
+	ident: EntryIdentifier,
+	parent: EntryIdentifier,
+	context: &Rc<RefCell<PAContext>>,
+	info_sx: mpsc::UnboundedSender<EntryIdentifier>,
+) {
+	let mut introspector = context.borrow_mut().introspect();
+
+	match ident.entry_type {
+		EntryType::SinkInput => {
+			introspector.move_sink_input_by_index(
+				ident.index,
+				parent.index,
+				Some(Box::new(move |_| {
+					info_sx.send(parent).unwrap();
+					info_sx.send(ident).unwrap();
+				})),
+			);
+		}
+		EntryType::SourceOutput => {
+			introspector.move_source_output_by_index(
+				ident.index,
+				parent.index,
+				Some(Box::new(move |_| {
+					info_sx.send(parent).unwrap();
+					info_sx.send(ident).unwrap();
+				})),
+			);
+		}
+		_ => {}
+	};
+}
+
+fn set_suspend(ident: EntryIdentifier, suspend: bool, context: &Rc<RefCell<PAContext>>) {
+	let mut introspector = context.borrow_mut().introspect();
+	match ident.entry_type {
+		EntryType::Sink => {
+			introspector.suspend_sink_by_index(ident.index, suspend, None);
+		}
+		EntryType::Source => {
+			introspector.suspend_source_by_index(ident.index, suspend, None);
+		}
+		_ => {}
+	};
+}
+
+fn kill_entry(ident: EntryIdentifier, context: &Rc<RefCell<PAContext>>) {
+	let mut introspector = context.borrow_mut().introspect();
+	match ident.entry_type {
+		EntryType::SinkInput => {
+			introspector.kill_sink_input(ident.index, |_| {});
+		}
+		EntryType::SourceOutput => {
+			introspector.kill_source_output(ident.index, |_| {});
+		}
+		_ => {}
+	};
+}
+
+fn set_mute(ident: EntryIdentifier, mute: bool, context: &Rc<RefCell<PAContext>>) {
+	let mut introspector = context.borrow_mut().introspect();
+	match ident.entry_type {
+		EntryType::Sink => {
+			introspector.set_sink_mute_by_index(ident.index, mute, None);
+		}
+		EntryType::SinkInput => {
+			introspector.set_sink_input_mute(ident.index, mute, None);
+		}
+		EntryType::Source => {
+			introspector.set_source_mute_by_index(ident.index, mute, None);
+		}
+		EntryType::SourceOutput => {
+			introspector.set_source_output_mute(ident.index, mute, None);
+		}
+		_ => {}
+	};
+}
--- a/src/clients/volume/pulse/pa_interface.rs
+++ b/src/clients/volume/pulse/pa_interface.rs
@@ -0,0 +1,162 @@
+use std::ops::Deref;
+
+// use lazy_static::lazy_static;
+use libpulse_binding::proplist::Proplist;
+use tracing::{debug, error, info};
+// use state::Storage;
+use color_eyre::{Report, Result};
+
+use super::{callbacks, common::*, pa_actions};
+
+// lazy_static! {
+// 	pub static ref ACTIONS_SX: Storage<mpsc::UnboundedSender<EntryUpdate>> = Storage::new();
+// }
+
+pub async fn start(
+	mut internal_rx: mpsc::Receiver<PAInternal>,
+	info_sx: mpsc::UnboundedSender<EntryIdentifier>,
+	actions_sx: mpsc::UnboundedSender<EntryUpdate>,
+) -> Result<()> {
+	// (*ACTIONS_SX).set(actions_sx);
+
+	// Create new mainloop and context
+	let mut proplist = Proplist::new().unwrap();
+	proplist
+		.set_str(libpulse_binding::proplist::properties::APPLICATION_NAME, "RsMixer")
+		.unwrap();
+
+	debug!("[PAInterface] Creating new mainloop");
+	let mainloop = Rc::new(RefCell::new(match Mainloop::new() {
+		Some(ml) => ml,
+		None => {
+			error!("[PAInterface] Error while creating new mainloop");
+			return Err(Report::msg("Error while creating new mainloop"));
+		}
+	}));
+
+	debug!("[PAInterface] Creating new context");
+	let context = Rc::new(RefCell::new(
+		match PAContext::new_with_proplist(
+			mainloop.borrow_mut().deref().deref(),
+			"RsMixerContext",
+			&proplist,
+		) {
+			Some(ctx) => ctx,
+			None => {
+				error!("[PAInterface] Error while creating new context");
+				return Err(Report::msg("Error while creating new context"));
+			}
+		},
+	));
+
+	// PAContext state change callback
+	{
+		debug!("[PAInterface] Registering state change callback");
+		let ml_ref = Rc::clone(&mainloop);
+		let context_ref = Rc::clone(&context);
+		context
+			.borrow_mut()
+			.set_state_callback(Some(Box::new(move || {
+				let state = unsafe { (*context_ref.as_ptr()).get_state() };
+				if matches!(
+					state,
+					libpulse_binding::context::State::Ready
+						| libpulse_binding::context::State::Failed
+						| libpulse_binding::context::State::Terminated
+				) {
+					unsafe { (*ml_ref.as_ptr()).signal(false) };
+				}
+			})));
+	}
+
+	// Try to connect to pulseaudio
+	debug!("[PAInterface] Connecting context");
+
+	if context
+		.borrow_mut()
+		.connect(None, libpulse_binding::context::FlagSet::NOFLAGS, None)
+		.is_err()
+	{
+		error!("[PAInterface] Error while connecting context");
+		return Err(Report::msg("Error while connecting context"));
+	}
+
+	info!("[PAInterface] Starting mainloop");
+
+	// start mainloop
+	mainloop.borrow_mut().lock();
+
+	if let Err(err) = mainloop.borrow_mut().start() {
+		return Err(Report::new(err));
+	}
+
+	debug!("[PAInterface] Waiting for context to be ready...");
+	// wait for context to be ready
+	loop {
+		match context.borrow_mut().get_state() {
+			libpulse_binding::context::State::Ready => {
+				break;
+			}
+			libpulse_binding::context::State::Failed | libpulse_binding::context::State::Terminated => {
+				mainloop.borrow_mut().unlock();
+				mainloop.borrow_mut().stop();
+				error!("[PAInterface] Connection failed or context terminated");
+				return Err(Report::msg("Connection failed or context terminated"));
+			}
+			_ => {
+				mainloop.borrow_mut().wait();
+			}
+		}
+	}
+	debug!("[PAInterface] PAContext ready");
+
+	context.borrow_mut().set_state_callback(None);
+
+	callbacks::subscribe(&context, info_sx.clone())?;
+	callbacks::request_current_state(context.clone(), info_sx.clone())?;
+
+	mainloop.borrow_mut().unlock();
+
+	debug!("[PAInterface] Actually starting our mainloop");
+
+	let mut monitors = Monitors::default();
+	let mut last_targets = HashMap::new();
+
+	while let Some(msg) = internal_rx.recv().await {
+		mainloop.borrow_mut().lock();
+
+		match context.borrow_mut().get_state() {
+			libpulse_binding::context::State::Ready => {}
+			_ => {
+				mainloop.borrow_mut().unlock();
+				return Err(Report::msg("Disconnected while working"))
+			}
+		}
+
+		match msg {
+			PAInternal::AskInfo(ident) => {
+				callbacks::request_info(ident, &context, info_sx.clone());
+			}
+			PAInternal::Tick => {
+				// remove failed monitors
+				monitors.filter(&mainloop, &context, &last_targets);
+			}
+			PAInternal::Command(cmd) => {
+				let cmd = cmd.deref();
+				if pa_actions::handle_command(cmd.clone(), &context, &info_sx).is_none() {
+					monitors.filter(&mainloop, &context, &HashMap::new());
+					mainloop.borrow_mut().unlock();
+					break;
+				}
+
+				if let PulseAudioAction::CreateMonitors(mons) = cmd.clone() {
+					last_targets = mons;
+					monitors.filter(&mainloop, &context, &last_targets);
+				}
+			}
+		};
+		mainloop.borrow_mut().unlock();
+	}
+
+	Ok(())
+}
--- a/src/clients/volume/pulse_bak.rs
+++ b/src/clients/volume/pulse_bak.rs
@@ -0,0 +1,90 @@
+use crate::clients::volume::VolumeClient;
+use libpulse_binding::context::State;
+use libpulse_binding::{
+    context::{Context, FlagSet},
+    mainloop::threaded::Mainloop,
+    proplist::{properties, Proplist},
+};
+use std::cell::RefCell;
+use std::ops::Deref;
+use std::rc::Rc;
+use tracing::{debug, error};
+
+pub fn test() {
+    let mut prop_list = Proplist::new().unwrap();
+    prop_list
+        .set_str(properties::APPLICATION_NAME, "ironbar")
+        .unwrap();
+
+    let mainloop = Rc::new(RefCell::new(Mainloop::new().unwrap()));
+
+    let context = Rc::new(RefCell::new(
+        Context::new_with_proplist(mainloop.borrow().deref(), "ironbar_context", &prop_list)
+            .unwrap(),
+    ));
+
+    // PAContext state change callback
+    {
+        debug!("[PAInterface] Registering state change callback");
+        let ml_ref = Rc::clone(&mainloop);
+        let context_ref = Rc::clone(&context);
+        context
+            .borrow_mut()
+            .set_state_callback(Some(Box::new(move || {
+                let state = unsafe { (*context_ref.as_ptr()).get_state() };
+                if matches!(state, State::Ready | State::Failed | State::Terminated) {
+                    unsafe { (*ml_ref.as_ptr()).signal(false) };
+                }
+            })));
+    }
+
+    if let Err(err) = context.borrow_mut().connect(None, FlagSet::NOFLAGS, None) {
+        error!("{err:?}");
+    }
+
+    println!("{:?}", context.borrow().get_server());
+
+    mainloop.borrow_mut().lock();
+    if let Err(err) = mainloop.borrow_mut().start() {
+        error!("{err:?}");
+    }
+
+    debug!("[PAInterface] Waiting for context to be ready...");
+    println!("[PAInterface] Waiting for context to be ready...");
+    // wait for context to be ready
+    loop {
+        match context.borrow().get_state() {
+            State::Ready => {
+                break;
+            }
+            State::Failed | State::Terminated => {
+                mainloop.borrow_mut().unlock();
+                mainloop.borrow_mut().stop();
+                error!("[PAInterface] Connection failed or context terminated");
+            }
+            _ => {
+                mainloop.borrow_mut().wait();
+            }
+        }
+    }
+    debug!("[PAInterface] PAContext ready");
+    println!("[PAInterface] PAContext ready");
+
+    context.borrow_mut().set_state_callback(None);
+
+    println!("jfgjfgg");
+
+    let introspector = context.borrow().introspect();
+
+    println!("jfgjfgg2");
+
+    introspector.get_sink_info_list(|result| {
+        println!("boo: {result:?}");
+    });
+
+    println!("fjgjfgf??");
+}
+
+struct PulseVolumeClient {}
+
+impl VolumeClient for PulseVolumeClient {}
--- a/src/clients/wayland/client.rs
+++ b/src/clients/wayland/client.rs
@@ -1,30 +1,61 @@
-use super::toplevel::{ToplevelEvent, ToplevelInfo};
-use super::toplevel_manager::listen_for_toplevels;
-use super::ToplevelChange;
-use super::{Env, ToplevelHandler};
+use super::wlr_foreign_toplevel::{
+    handle::{ToplevelEvent, ToplevelInfo},
+    manager::listen_for_toplevels,
+};
+use super::{DData, Env, ToplevelHandler};
+use crate::{error as err, send};
+use cfg_if::cfg_if;
 use color_eyre::Report;
 use indexmap::IndexMap;
 use smithay_client_toolkit::environment::Environment;
 use smithay_client_toolkit::output::{with_output_info, OutputInfo};
-use smithay_client_toolkit::reexports::calloop;
-use smithay_client_toolkit::{new_default_environment, WaylandSource};
+use smithay_client_toolkit::reexports::calloop::channel::{channel, Event, Sender};
+use smithay_client_toolkit::reexports::calloop::EventLoop;
+use smithay_client_toolkit::WaylandSource;
+use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
-use std::time::Duration;
 use tokio::sync::{broadcast, oneshot};
 use tokio::task::spawn_blocking;
-use tracing::{error, trace};
+use tracing::{debug, error};
 use wayland_client::protocol::wl_seat::WlSeat;
+use wayland_client::{ConnectError, Display, EventQueue};
 use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::{
    zwlr_foreign_toplevel_handle_v1::ZwlrForeignToplevelHandleV1,
    zwlr_foreign_toplevel_manager_v1::ZwlrForeignToplevelManagerV1,
 };

+cfg_if! {
+    if #[cfg(feature = "clipboard")] {
+        use super::{ClipboardItem};
+        use super::wlr_data_control::manager::{listen_to_devices, DataControlDeviceHandler};
+        use crate::{read_lock, write_lock};
+        use tokio::spawn;
+    }
+}
+
+#[derive(Debug)]
+pub enum Request {
+    /// Copies the value to the clipboard
+    #[cfg(feature = "clipboard")]
+    CopyToClipboard(Arc<ClipboardItem>),
+    /// Forces a dispatch, flushing any currently queued events
+    Refresh,
+}
+
 pub struct WaylandClient {
    pub outputs: Vec<OutputInfo>,
    pub seats: Vec<WlSeat>,
+
    pub toplevels: Arc<RwLock<IndexMap<usize, (ToplevelInfo, ZwlrForeignToplevelHandleV1)>>>,
    toplevel_tx: broadcast::Sender<ToplevelEvent>,
    _toplevel_rx: broadcast::Receiver<ToplevelEvent>,
+
+    #[cfg(feature = "clipboard")]
+    clipboard_tx: broadcast::Sender<Arc<ClipboardItem>>,
+    #[cfg(feature = "clipboard")]
+    clipboard: Arc<RwLock<Option<Arc<ClipboardItem>>>>,
+
+    request_tx: Sender<Request>,
 }

 impl WaylandClient {
@@ -34,63 +65,102 @@ impl WaylandClient {

        let (toplevel_tx, toplevel_rx) = broadcast::channel(32);

-        let toplevel_tx2 = toplevel_tx.clone();
-
        let toplevels = Arc::new(RwLock::new(IndexMap::new()));
        let toplevels2 = toplevels.clone();

-        // `queue` is not send so we need to handle everything inside the task
+        let toplevel_tx2 = toplevel_tx.clone();
+
+        cfg_if! {
+            if #[cfg(feature = "clipboard")] {
+                let (clipboard_tx, mut clipboard_rx) = broadcast::channel(32);
+                let clipboard = Arc::new(RwLock::new(None));
+                let clipboard_tx2 = clipboard_tx.clone();
+            }
+        }
+
+        let (ev_tx, ev_rx) = channel::<Request>();
+
+        // `queue` is not `Send` so we need to handle everything inside the task
        spawn_blocking(move || {
+            let toplevels = toplevels2;
+            let toplevel_tx = toplevel_tx2;
+
            let (env, _display, queue) =
-                new_default_environment!(Env, fields = [toplevel: ToplevelHandler::init()])
-                    .expect("Failed to connect to Wayland compositor");
+                Self::new_environment().expect("Failed to connect to Wayland compositor");
+
+            let mut event_loop =
+                EventLoop::<DData>::try_new().expect("Failed to create new event loop");
+            WaylandSource::new(queue)
+                .quick_insert(event_loop.handle())
+                .expect("Failed to insert Wayland event queue into event loop");

            let outputs = Self::get_outputs(&env);
-            output_tx
-                .send(outputs)
-                .expect("Failed to send outputs out of task");
+            send!(output_tx, outputs);

            let seats = env.get_all_seats();
-            seat_tx
-                .send(
-                    seats
-                        .into_iter()
-                        .map(|seat| seat.detach())
-                        .collect::<Vec<WlSeat>>(),
-                )
-                .expect("Failed to send seats out of task");
+
+            // TODO: Actually handle seats properly
+            #[cfg(feature = "clipboard")]
+            let default_seat = seats[0].detach();
+
+            send!(
+                seat_tx,
+                seats
+                    .into_iter()
+                    .map(|seat| seat.detach())
+                    .collect::<Vec<WlSeat>>()
+            );
+
+            let handle = event_loop.handle();
+            handle
+                .insert_source(ev_rx, move |event, _metadata, ddata| {
+                    // let env = &ddata.env;
+                    match event {
+                        Event::Msg(Request::Refresh) => debug!("Received refresh event"),
+                        #[cfg(feature = "clipboard")]
+                        Event::Msg(Request::CopyToClipboard(value)) => {
+                            super::wlr_data_control::copy_to_clipboard(
+                                &ddata.env,
+                                &default_seat,
+                                &value,
+                            )
+                            .expect("Failed to copy to clipboard");
+                        }
+                        Event::Closed => panic!("Channel unexpectedly closed"),
+                    }
+                })
+                .expect("Failed to insert channel into event queue");

            let _toplevel_manager = env.require_global::<ZwlrForeignToplevelManagerV1>();

-            let _listener = listen_for_toplevels(env, move |handle, event, _ddata| {
-                trace!("Received toplevel event: {:?}", event);
-
-                if event.change == ToplevelChange::Close {
-                    toplevels2
-                        .write()
-                        .expect("Failed to get write lock on toplevels")
-                        .remove(&event.toplevel.id);
-                } else {
-                    toplevels2
-                        .write()
-                        .expect("Failed to get write lock on toplevels")
-                        .insert(event.toplevel.id, (event.toplevel.clone(), handle));
-                }
-
-                toplevel_tx2
-                    .send(event)
-                    .expect("Failed to send toplevel event");
+            let _toplevel_listener = listen_for_toplevels(&env, move |handle, event, _ddata| {
+                super::wlr_foreign_toplevel::update_toplevels(
+                    &toplevels,
+                    handle,
+                    event,
+                    &toplevel_tx,
+                );
            });

-            let mut event_loop =
-                calloop::EventLoop::<()>::try_new().expect("Failed to create new event loop");
-            WaylandSource::new(queue)
-                .quick_insert(event_loop.handle())
-                .expect("Failed to insert event loop into wayland event queue");
+            cfg_if! {
+                if #[cfg(feature = "clipboard")] {
+                    let clipboard_tx = clipboard_tx2;
+                    let handle = event_loop.handle();
+
+                    let _offer_listener = listen_to_devices(&env, move |_seat, event, ddata| {
+                        debug!("Received clipboard event");
+                        super::wlr_data_control::receive_offer(event, &handle, clipboard_tx.clone(), ddata);
+                    });
+                }
+            }
+
+            let mut data = DData {
+                env,
+                offer_tokens: HashMap::new(),
+            };

            loop {
-                // TODO: Avoid need for duration here - can we force some event when sending requests?
-                if let Err(err) = event_loop.dispatch(Duration::from_millis(50), &mut ()) {
+                if let Err(err) = event_loop.dispatch(None, &mut data) {
                    error!(
                        "{:?}",
                        Report::new(err).wrap_err("Failed to dispatch pending wayland events")
@@ -99,18 +169,33 @@ impl WaylandClient {
            }
        });

-        let outputs = output_rx
-            .await
-            .expect("Failed to receive outputs from task");
+        // keep track of current clipboard item
+        #[cfg(feature = "clipboard")]
+        {
+            let clipboard = clipboard.clone();
+            spawn(async move {
+                while let Ok(item) = clipboard_rx.recv().await {
+                    let mut clipboard = write_lock!(clipboard);
+                    clipboard.replace(item);
+                }
+            });
+        }

-        let seats = seat_rx.await.expect("Failed to receive seats from task");
+        let outputs = output_rx.await.expect(err::ERR_CHANNEL_RECV);
+
+        let seats = seat_rx.await.expect(err::ERR_CHANNEL_RECV);

        Self {
            outputs,
            seats,
+            #[cfg(feature = "clipboard")]
+            clipboard,
            toplevels,
            toplevel_tx,
            _toplevel_rx: toplevel_rx,
+            #[cfg(feature = "clipboard")]
+            clipboard_tx,
+            request_tx: ev_tx,
        }
    }

@@ -118,6 +203,26 @@ impl WaylandClient {
        self.toplevel_tx.subscribe()
    }

+    #[cfg(feature = "clipboard")]
+    pub fn subscribe_clipboard(&self) -> broadcast::Receiver<Arc<ClipboardItem>> {
+        self.clipboard_tx.subscribe()
+    }
+
+    pub fn roundtrip(&self) {
+        send!(self.request_tx, Request::Refresh);
+    }
+
+    #[cfg(feature = "clipboard")]
+    pub fn get_clipboard(&self) -> Option<Arc<ClipboardItem>> {
+        let clipboard = read_lock!(self.clipboard);
+        clipboard.as_ref().cloned()
+    }
+
+    #[cfg(feature = "clipboard")]
+    pub fn copy_to_clipboard(&self, item: Arc<ClipboardItem>) {
+        send!(self.request_tx, Request::CopyToClipboard(item));
+    }
+
    fn get_outputs(env: &Environment<Env>) -> Vec<OutputInfo> {
        let outputs = env.get_all_outputs();

@@ -126,4 +231,57 @@ impl WaylandClient {
            .filter_map(|output| with_output_info(output, Clone::clone))
            .collect()
    }
+
+    fn new_environment() -> Result<(Environment<Env>, Display, EventQueue), ConnectError> {
+        Display::connect_to_env().and_then(|display| {
+            let mut queue = display.create_event_queue();
+            let ret = {
+                let mut sctk_seats = smithay_client_toolkit::seat::SeatHandler::new();
+                let sctk_data_device_manager =
+                    smithay_client_toolkit::data_device::DataDeviceHandler::init(&mut sctk_seats);
+
+                #[cfg(feature = "clipboard")]
+                let data_control_device = DataControlDeviceHandler::init(&mut sctk_seats);
+
+                let sctk_primary_selection_manager =
+                    smithay_client_toolkit::primary_selection::PrimarySelectionHandler::init(
+                        &mut sctk_seats,
+                    );
+
+                let display = ::smithay_client_toolkit::reexports::client::Proxy::clone(&display);
+                let env = Environment::new(
+                    &display.attach(queue.token()),
+                    &mut queue,
+                    Env {
+                        sctk_compositor: smithay_client_toolkit::environment::SimpleGlobal::new(),
+                        sctk_subcompositor: smithay_client_toolkit::environment::SimpleGlobal::new(
+                        ),
+                        sctk_shm: smithay_client_toolkit::shm::ShmHandler::new(),
+                        sctk_outputs: smithay_client_toolkit::output::OutputHandler::new(),
+                        sctk_seats,
+                        sctk_data_device_manager,
+                        sctk_primary_selection_manager,
+                        toplevel: ToplevelHandler::init(),
+                        #[cfg(feature = "clipboard")]
+                        data_control_device,
+                    },
+                );
+
+                if let Ok(env) = env.as_ref() {
+                    let _psm = env.get_primary_selection_manager();
+                }
+
+                env
+            };
+            match ret {
+                Ok(env) => Ok((env, display, queue)),
+                Err(_e) => display.protocol_error().map_or_else(
+                    || Err(ConnectError::NoCompositorListening),
+                    |perr| {
+                        panic!("[SCTK] A protocol error occured during initial setup: {perr}");
+                    },
+                ),
+            }
+        })
+    }
 }
--- a/src/clients/wayland/mod.rs
+++ b/src/clients/wayland/mod.rs
@@ -1,21 +1,32 @@
 mod client;
-mod toplevel;
-mod toplevel_manager;

-extern crate smithay_client_toolkit as sctk;
+mod wlr_foreign_toplevel;

+use std::collections::HashMap;
 use async_once::AsyncOnce;
 use lazy_static::lazy_static;
-pub use toplevel::{ToplevelChange, ToplevelEvent, ToplevelInfo};
-use toplevel_manager::{ToplevelHandler, ToplevelHandling, ToplevelStatusListener};
-use wayland_client::{Attached, DispatchData, Interface};
-use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::{
-    zwlr_foreign_toplevel_handle_v1::ZwlrForeignToplevelHandleV1,
-    zwlr_foreign_toplevel_manager_v1::ZwlrForeignToplevelManagerV1,
-};
+use std::fmt::Debug;
+use cfg_if::cfg_if;
+use smithay_client_toolkit::default_environment;
+use smithay_client_toolkit::environment::Environment;
+use smithay_client_toolkit::reexports::calloop::RegistrationToken;
+use wayland_client::{Attached, Interface};
+use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::zwlr_foreign_toplevel_manager_v1::ZwlrForeignToplevelManagerV1;
+pub use wlr_foreign_toplevel::handle::{ToplevelChange, ToplevelEvent, ToplevelInfo};
+use wlr_foreign_toplevel::manager::{ToplevelHandler};

 pub use client::WaylandClient;

+cfg_if! {
+    if #[cfg(feature = "clipboard")] {
+        mod wlr_data_control;
+
+        use wayland_protocols::wlr::unstable::data_control::v1::client::zwlr_data_control_manager_v1::ZwlrDataControlManagerV1;
+        use wlr_data_control::manager::DataControlDeviceHandler;
+        pub use wlr_data_control::{ClipboardItem, ClipboardValue};
+    }
+}
+
 /// A utility for lazy-loading globals.
 /// Taken from `smithay_client_toolkit` where it's not exposed
 #[derive(Debug)]
@@ -25,21 +36,32 @@ enum LazyGlobal<I: Interface> {
    Bound(Attached<I>),
 }

-sctk::default_environment!(Env,
-    fields = [
-        toplevel: ToplevelHandler
-    ],
-    singles = [
-        ZwlrForeignToplevelManagerV1 => toplevel
-    ],
-);
+pub struct DData {
+    env: Environment<Env>,
+    offer_tokens: HashMap<u128, RegistrationToken>,
+}

-impl ToplevelHandling for Env {
-    fn listen<F>(&mut self, f: F) -> ToplevelStatusListener
-    where
-        F: FnMut(ZwlrForeignToplevelHandleV1, ToplevelEvent, DispatchData) + 'static,
-    {
-        self.toplevel.listen(f)
+cfg_if! {
+    if #[cfg(feature = "clipboard")] {
+        default_environment!(Env,
+            fields = [
+                toplevel: ToplevelHandler,
+                data_control_device: DataControlDeviceHandler
+            ],
+            singles = [
+                ZwlrForeignToplevelManagerV1 => toplevel,
+                ZwlrDataControlManagerV1 => data_control_device
+            ],
+        );
+    } else {
+            default_environment!(Env,
+            fields = [
+                toplevel: ToplevelHandler,
+            ],
+            singles = [
+                ZwlrForeignToplevelManagerV1 => toplevel,
+            ],
+        );
    }
 }

--- a/src/clients/wayland/wlr_data_control/device.rs
+++ b/src/clients/wayland/wlr_data_control/device.rs
@@ -0,0 +1,88 @@
+use super::offer::DataControlOffer;
+use super::source::DataControlSource;
+use crate::lock;
+use std::sync::{Arc, Mutex};
+use wayland_client::protocol::wl_seat::WlSeat;
+use wayland_client::{Attached, DispatchData, Main};
+use wayland_protocols::wlr::unstable::data_control::v1::client::{
+    zwlr_data_control_device_v1::{Event, ZwlrDataControlDeviceV1},
+    zwlr_data_control_manager_v1::ZwlrDataControlManagerV1,
+    zwlr_data_control_offer_v1::ZwlrDataControlOfferV1,
+};
+
+#[derive(Debug)]
+struct Inner {
+    offer: Option<Arc<DataControlOffer>>,
+}
+
+impl Inner {
+    fn new_offer(&mut self, offer: &Main<ZwlrDataControlOfferV1>) {
+        self.offer.replace(Arc::new(DataControlOffer::new(offer)));
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct DataControlDeviceEvent(pub Arc<DataControlOffer>);
+
+fn data_control_device_implem<F>(
+    event: Event,
+    inner: &mut Inner,
+    implem: &mut F,
+    ddata: DispatchData,
+) where
+    F: FnMut(DataControlDeviceEvent, DispatchData),
+{
+    match event {
+        Event::DataOffer { id } => {
+            inner.new_offer(&id);
+        }
+        Event::Selection { id: Some(offer) } => {
+            let inner_offer = inner
+                .offer
+                .clone()
+                .expect("Offer should exist at this stage");
+            if offer == inner_offer.offer {
+                implem(DataControlDeviceEvent(inner_offer), ddata);
+            }
+        }
+        _ => {}
+    }
+}
+
+pub struct DataControlDevice {
+    device: ZwlrDataControlDeviceV1,
+    _inner: Arc<Mutex<Inner>>,
+}
+
+impl DataControlDevice {
+    pub fn init_for_seat<F>(
+        manager: &Attached<ZwlrDataControlManagerV1>,
+        seat: &WlSeat,
+        mut callback: F,
+    ) -> Self
+    where
+        F: FnMut(DataControlDeviceEvent, DispatchData) + 'static,
+    {
+        let inner = Arc::new(Mutex::new(Inner { offer: None }));
+
+        let device = manager.get_data_device(seat);
+
+        {
+            let inner = inner.clone();
+            device.quick_assign(move |_handle, event, ddata| {
+                let mut inner = lock!(inner);
+                data_control_device_implem(event, &mut inner, &mut callback, ddata);
+            });
+        }
+
+        Self {
+            device: device.detach(),
+            _inner: inner,
+        }
+    }
+
+    pub fn set_selection(&self, source: &Option<DataControlSource>) {
+        self.device
+            .set_selection(source.as_ref().map(|s| &s.source));
+    }
+}
--- a/src/clients/wayland/wlr_data_control/manager.rs
+++ b/src/clients/wayland/wlr_data_control/manager.rs
@@ -0,0 +1,253 @@
+use super::device::{DataControlDevice, DataControlDeviceEvent};
+use super::source::DataControlSource;
+use smithay_client_toolkit::data_device::WritePipe;
+use smithay_client_toolkit::environment::{Environment, GlobalHandler};
+use smithay_client_toolkit::seat::{SeatHandling, SeatListener};
+use smithay_client_toolkit::MissingGlobal;
+use std::cell::RefCell;
+use std::rc::{self, Rc};
+use tracing::warn;
+use wayland_client::protocol::wl_registry::WlRegistry;
+use wayland_client::protocol::wl_seat::WlSeat;
+use wayland_client::{Attached, DispatchData};
+use wayland_protocols::wlr::unstable::data_control::v1::client::zwlr_data_control_manager_v1::ZwlrDataControlManagerV1;
+
+enum DataControlDeviceHandlerInner {
+    Ready {
+        manager: Attached<ZwlrDataControlManagerV1>,
+        devices: Vec<(WlSeat, DataControlDevice)>,
+        status_listeners: Rc<RefCell<Vec<rc::Weak<RefCell<DataControlDeviceStatusCallback>>>>>,
+    },
+    Pending {
+        seats: Vec<WlSeat>,
+        status_listeners: Rc<RefCell<Vec<rc::Weak<RefCell<DataControlDeviceStatusCallback>>>>>,
+    },
+}
+
+impl DataControlDeviceHandlerInner {
+    fn init_manager(&mut self, manager: Attached<ZwlrDataControlManagerV1>) {
+        let (seats, status_listeners) = if let Self::Pending {
+            seats,
+            status_listeners,
+        } = self
+        {
+            (std::mem::take(seats), status_listeners.clone())
+        } else {
+            warn!("Ignoring second zwlr_data_control_manager_v1");
+            return;
+        };
+
+        let mut devices = Vec::new();
+
+        for seat in seats {
+            let my_seat = seat.clone();
+            let status_listeners = status_listeners.clone();
+            let device =
+                DataControlDevice::init_for_seat(&manager, &seat, move |event, dispatch_data| {
+                    notify_status_listeners(&my_seat, &event, dispatch_data, &status_listeners);
+                });
+            devices.push((seat.clone(), device));
+        }
+
+        *self = Self::Ready {
+            manager,
+            devices,
+            status_listeners,
+        };
+    }
+
+    fn get_manager(&self) -> Option<Attached<ZwlrDataControlManagerV1>> {
+        match self {
+            Self::Ready { manager, .. } => Some(manager.clone()),
+            Self::Pending { .. } => None,
+        }
+    }
+
+    fn new_seat(&mut self, seat: &WlSeat) {
+        match self {
+            Self::Ready {
+                manager,
+                devices,
+                status_listeners,
+            } => {
+                if devices.iter().any(|(s, _)| s == seat) {
+                    // the seat already exists, nothing to do
+                    return;
+                }
+                let my_seat = seat.clone();
+                let status_listeners = status_listeners.clone();
+                let device =
+                    DataControlDevice::init_for_seat(manager, seat, move |event, dispatch_data| {
+                        notify_status_listeners(&my_seat, &event, dispatch_data, &status_listeners);
+                    });
+                devices.push((seat.clone(), device));
+            }
+            Self::Pending { seats, .. } => {
+                seats.push(seat.clone());
+            }
+        }
+    }
+
+    fn remove_seat(&mut self, seat: &WlSeat) {
+        match self {
+            Self::Ready { devices, .. } => devices.retain(|(s, _)| s != seat),
+            Self::Pending { seats, .. } => seats.retain(|s| s != seat),
+        }
+    }
+
+    fn create_source<F>(&self, mime_types: Vec<String>, callback: F) -> Option<DataControlSource>
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static,
+    {
+        match self {
+            Self::Ready { manager, .. } => {
+                let source = DataControlSource::new(manager, mime_types, callback);
+                Some(source)
+            }
+            Self::Pending { .. } => None,
+        }
+    }
+
+    fn with_device<F>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal>
+    where
+        F: FnOnce(&DataControlDevice),
+    {
+        match self {
+            Self::Ready { devices, .. } => {
+                let device = devices
+                    .iter()
+                    .find_map(|(s, device)| if s == seat { Some(device) } else { None });
+
+                device.map_or(Err(MissingGlobal), |device| {
+                    f(device);
+                    Ok(())
+                })
+            }
+            Self::Pending { .. } => Err(MissingGlobal),
+        }
+    }
+}
+
+pub struct DataControlDeviceHandler {
+    inner: Rc<RefCell<DataControlDeviceHandlerInner>>,
+    status_listeners: Rc<RefCell<Vec<rc::Weak<RefCell<DataControlDeviceStatusCallback>>>>>,
+    _seat_listener: SeatListener,
+}
+
+impl DataControlDeviceHandler {
+    pub fn init<S>(seat_handler: &mut S) -> Self
+    where
+        S: SeatHandling,
+    {
+        let status_listeners = Rc::new(RefCell::new(Vec::new()));
+
+        let inner = Rc::new(RefCell::new(DataControlDeviceHandlerInner::Pending {
+            seats: Vec::new(),
+            status_listeners: status_listeners.clone(),
+        }));
+
+        let seat_inner = inner.clone();
+        let seat_listener = seat_handler.listen(move |seat, seat_data, _| {
+            if seat_data.defunct {
+                seat_inner.borrow_mut().remove_seat(&seat);
+            } else {
+                seat_inner.borrow_mut().new_seat(&seat);
+            }
+        });
+
+        Self {
+            inner,
+            _seat_listener: seat_listener,
+            status_listeners,
+        }
+    }
+}
+
+impl GlobalHandler<ZwlrDataControlManagerV1> for DataControlDeviceHandler {
+    fn created(
+        &mut self,
+        registry: Attached<WlRegistry>,
+        id: u32,
+        version: u32,
+        _ddata: DispatchData,
+    ) {
+        // data control manager is supported until version 2
+        let version = std::cmp::min(version, 2);
+
+        let manager = registry.bind::<ZwlrDataControlManagerV1>(version, id);
+        self.inner.borrow_mut().init_manager((*manager).clone());
+    }
+
+    fn get(&self) -> Option<Attached<ZwlrDataControlManagerV1>> {
+        RefCell::borrow(&self.inner).get_manager()
+    }
+}
+
+type DataControlDeviceStatusCallback =
+    dyn FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static;
+
+/// Notifies the callbacks of an event on the data device
+fn notify_status_listeners(
+    seat: &WlSeat,
+    event: &DataControlDeviceEvent,
+    mut ddata: DispatchData,
+    listeners: &RefCell<Vec<rc::Weak<RefCell<DataControlDeviceStatusCallback>>>>,
+) {
+    listeners.borrow_mut().retain(|lst| {
+        rc::Weak::upgrade(lst).map_or(false, |cb| {
+            (cb.borrow_mut())(seat.clone(), event.clone(), ddata.reborrow());
+            true
+        })
+    });
+}
+
+pub struct DataControlDeviceStatusListener {
+    _cb: Rc<RefCell<DataControlDeviceStatusCallback>>,
+}
+
+pub trait DataControlDeviceHandling {
+    fn listen<F>(&mut self, f: F) -> DataControlDeviceStatusListener
+    where
+        F: FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static;
+
+    fn with_data_control_device<F>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal>
+    where
+        F: FnOnce(&DataControlDevice);
+
+    fn create_source<F>(&self, mime_types: Vec<String>, callback: F) -> Option<DataControlSource>
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static;
+}
+
+impl DataControlDeviceHandling for DataControlDeviceHandler {
+    fn listen<F>(&mut self, f: F) -> DataControlDeviceStatusListener
+    where
+        F: FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static,
+    {
+        let rc = Rc::new(RefCell::new(f)) as Rc<_>;
+        self.status_listeners.borrow_mut().push(Rc::downgrade(&rc));
+        DataControlDeviceStatusListener { _cb: rc }
+    }
+
+    fn with_data_control_device<F>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal>
+    where
+        F: FnOnce(&DataControlDevice),
+    {
+        RefCell::borrow(&self.inner).with_device(seat, f)
+    }
+
+    fn create_source<F>(&self, mime_types: Vec<String>, callback: F) -> Option<DataControlSource>
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static,
+    {
+        RefCell::borrow(&self.inner).create_source(mime_types, callback)
+    }
+}
+
+pub fn listen_to_devices<E, F>(env: &Environment<E>, f: F) -> DataControlDeviceStatusListener
+where
+    E: DataControlDeviceHandling,
+    F: FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static,
+{
+    env.with_inner(move |inner| DataControlDeviceHandling::listen(inner, f))
+}
--- a/src/clients/wayland/wlr_data_control/mod.rs
+++ b/src/clients/wayland/wlr_data_control/mod.rs
@@ -0,0 +1,258 @@
+pub mod device;
+pub mod manager;
+pub mod offer;
+pub mod source;
+
+use super::Env;
+use crate::clients::wayland::DData;
+use crate::send;
+use color_eyre::Report;
+use device::{DataControlDevice, DataControlDeviceEvent};
+use glib::Bytes;
+use manager::{DataControlDeviceHandling, DataControlDeviceStatusListener};
+use smithay_client_toolkit::data_device::WritePipe;
+use smithay_client_toolkit::environment::Environment;
+use smithay_client_toolkit::reexports::calloop::LoopHandle;
+use smithay_client_toolkit::MissingGlobal;
+use source::DataControlSource;
+use std::fs::File;
+use std::io;
+use std::io::{Read, Write};
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
+use std::time::UNIX_EPOCH;
+use tokio::sync::broadcast;
+use tracing::{debug, error, trace};
+use wayland_client::protocol::wl_seat::WlSeat;
+use wayland_client::DispatchData;
+
+static COUNTER: AtomicUsize = AtomicUsize::new(1);
+
+const INTERNAL_MIME_TYPE: &str = "x-ironbar-internal";
+
+fn get_id() -> usize {
+    COUNTER.fetch_add(1, Ordering::Relaxed)
+}
+
+#[derive(Debug, Clone, Eq)]
+pub struct ClipboardItem {
+    pub id: usize,
+    pub value: ClipboardValue,
+    pub mime_type: String,
+}
+
+impl PartialEq<Self> for ClipboardItem {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum ClipboardValue {
+    Text(String),
+    Image(Bytes),
+    Other,
+}
+
+impl DataControlDeviceHandling for Env {
+    fn listen<F>(&mut self, f: F) -> DataControlDeviceStatusListener
+    where
+        F: FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static,
+    {
+        self.data_control_device.listen(f)
+    }
+
+    fn with_data_control_device<F>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal>
+    where
+        F: FnOnce(&DataControlDevice),
+    {
+        self.data_control_device.with_data_control_device(seat, f)
+    }
+
+    fn create_source<F>(&self, mime_types: Vec<String>, callback: F) -> Option<DataControlSource>
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static,
+    {
+        self.data_control_device.create_source(mime_types, callback)
+    }
+}
+
+pub fn copy_to_clipboard<E>(
+    env: &Environment<E>,
+    seat: &WlSeat,
+    item: &ClipboardItem,
+) -> Result<(), MissingGlobal>
+where
+    E: DataControlDeviceHandling,
+{
+    debug!("Copying item with id {} [{}]", item.id, item.mime_type);
+    trace!("Copying: {item:?}");
+
+    let item = item.clone();
+
+    env.with_inner(|env| {
+        let mime_types = vec![INTERNAL_MIME_TYPE.to_string(), item.mime_type];
+        let source = env.create_source(mime_types, move |mime_type, mut pipe, _ddata| {
+            debug!(
+                "Triggering source callback for item with id {} [{}]",
+                item.id, mime_type
+            );
+
+            // FIXME: Not working for large (buffered) values in xwayland
+            let bytes = match &item.value {
+                ClipboardValue::Text(text) => text.as_bytes(),
+                ClipboardValue::Image(bytes) => bytes.as_ref(),
+                ClipboardValue::Other => panic!(
+                    "{:?}",
+                    io::Error::new(
+                        io::ErrorKind::Other,
+                        "Attempted to copy unsupported mime type",
+                    )
+                ),
+            };
+
+            if let Err(err) = pipe.write_all(bytes) {
+                error!("{err:?}");
+            }
+        });
+
+        env.with_data_control_device(seat, |device| device.set_selection(&source))
+    })
+}
+
+#[derive(Debug)]
+struct MimeType {
+    value: String,
+    category: MimeTypeCategory,
+}
+
+#[derive(Debug)]
+enum MimeTypeCategory {
+    Text,
+    Image,
+}
+
+impl MimeType {
+    fn parse(mime_types: &[String]) -> Option<Self> {
+        mime_types
+            .iter()
+            .map(|s| s.to_lowercase())
+            .find_map(|mime_type| match mime_type.as_str() {
+                "text"
+                | "string"
+                | "utf8_string"
+                | "text/plain"
+                | "text/plain;charset=utf-8"
+                | "text/plain;charset=iso-8859-1"
+                | "text/plain;charset=us-ascii"
+                | "text/plain;charset=unicode" => Some(Self {
+                    value: mime_type,
+                    category: MimeTypeCategory::Text,
+                }),
+                "image/png" | "image/jpg" | "image/jpeg" | "image/tiff" | "image/bmp"
+                | "image/x-bmp" | "image/icon" => Some(Self {
+                    value: mime_type,
+                    category: MimeTypeCategory::Image,
+                }),
+                _ => None,
+            })
+    }
+}
+
+pub fn receive_offer(
+    event: DataControlDeviceEvent,
+    handle: &LoopHandle<DData>,
+    tx: broadcast::Sender<Arc<ClipboardItem>>,
+    mut ddata: DispatchData,
+) {
+    let timestamp = std::time::SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .expect("Could not get epoch, system time is probably very wrong")
+        .as_nanos();
+
+    let offer = event.0;
+
+    let ddata = ddata
+        .get::<DData>()
+        .expect("Expected dispatch data to exist");
+
+    let handle2 = handle.clone();
+
+    let res = offer.with_mime_types(|mime_types| {
+        debug!("Offer mime types: {mime_types:?}");
+
+        if mime_types.contains(&INTERNAL_MIME_TYPE.to_string()) {
+            debug!("Skipping value provided by bar");
+            return Ok(());
+        }
+
+        let mime_type = MimeType::parse(mime_types);
+        debug!("Detected mime type: {mime_type:?}");
+
+        match mime_type {
+            Some(mime_type) => {
+                debug!("[{timestamp}] Sending clipboard read request ({mime_type:?})");
+                let read_pipe = offer.receive(mime_type.value.clone())?;
+                let source = handle.insert_source(read_pipe, move |(), file, ddata| {
+                    debug!(
+                        "[{timestamp}] Reading clipboard contents ({:?})",
+                        &mime_type.category
+                    );
+                    match read_file(&mime_type, file) {
+                        Ok(item) => {
+                            send!(tx, Arc::new(item));
+                        }
+                        Err(err) => error!("{err:?}"),
+                    }
+
+                    if let Some(src) = ddata.offer_tokens.remove(&timestamp) {
+                        handle2.remove(src);
+                    }
+                })?;
+
+                ddata.offer_tokens.insert(timestamp, source);
+            }
+            None => {
+                // send an event so the clipboard module is aware it's changed
+                send!(
+                    tx,
+                    Arc::new(ClipboardItem {
+                        id: usize::MAX,
+                        mime_type: String::new(),
+                        value: ClipboardValue::Other
+                    })
+                );
+            }
+        }
+
+        Ok::<(), Report>(())
+    });
+
+    if let Err(err) = res {
+        error!("{err:?}");
+    }
+}
+
+fn read_file(mime_type: &MimeType, file: &mut File) -> io::Result<ClipboardItem> {
+    let value = match mime_type.category {
+        MimeTypeCategory::Text => {
+            let mut txt = String::new();
+            file.read_to_string(&mut txt)?;
+
+            ClipboardValue::Text(txt)
+        }
+        MimeTypeCategory::Image => {
+            let mut bytes = vec![];
+            file.read_to_end(&mut bytes)?;
+            let bytes = Bytes::from(&bytes);
+
+            ClipboardValue::Image(bytes)
+        }
+    };
+
+    Ok(ClipboardItem {
+        id: get_id(),
+        value,
+        mime_type: mime_type.value.clone(),
+    })
+}
--- a/src/clients/wayland/wlr_data_control/offer.rs
+++ b/src/clients/wayland/wlr_data_control/offer.rs
@@ -0,0 +1,74 @@
+use crate::lock;
+use nix::fcntl::OFlag;
+use nix::unistd::{close, pipe2};
+use smithay_client_toolkit::data_device::ReadPipe;
+use std::io;
+use std::os::fd::FromRawFd;
+use std::sync::{Arc, Mutex};
+use tracing::warn;
+use wayland_client::Main;
+use wayland_protocols::wlr::unstable::data_control::v1::client::zwlr_data_control_offer_v1::{
+    Event, ZwlrDataControlOfferV1,
+};
+
+#[derive(Debug, Clone)]
+struct Inner {
+    mime_types: Vec<String>,
+}
+
+#[derive(Debug, Clone)]
+pub struct DataControlOffer {
+    inner: Arc<Mutex<Inner>>,
+    pub(crate) offer: ZwlrDataControlOfferV1,
+}
+
+impl DataControlOffer {
+    pub(crate) fn new(offer: &Main<ZwlrDataControlOfferV1>) -> Self {
+        let inner = Arc::new(Mutex::new(Inner {
+            mime_types: Vec::new(),
+        }));
+
+        {
+            let inner = inner.clone();
+
+            offer.quick_assign(move |_, event, _| {
+                let mut inner = lock!(inner);
+                if let Event::Offer { mime_type } = event {
+                    inner.mime_types.push(mime_type);
+                }
+            });
+        }
+
+        Self {
+            offer: offer.detach(),
+            inner,
+        }
+    }
+
+    pub fn with_mime_types<F, T>(&self, f: F) -> T
+    where
+        F: FnOnce(&[String]) -> T,
+    {
+        let inner = lock!(self.inner);
+        f(&inner.mime_types)
+    }
+
+    pub fn receive(&self, mime_type: String) -> io::Result<ReadPipe> {
+        // create a pipe
+        let (readfd, writefd) = pipe2(OFlag::O_CLOEXEC)?;
+
+        self.offer.receive(mime_type, writefd);
+
+        if let Err(err) = close(writefd) {
+            warn!("Failed to close write pipe: {}", err);
+        }
+
+        Ok(unsafe { FromRawFd::from_raw_fd(readfd) })
+    }
+}
+
+impl Drop for DataControlOffer {
+    fn drop(&mut self) {
+        self.offer.destroy();
+    }
+}
--- a/src/clients/wayland/wlr_data_control/source.rs
+++ b/src/clients/wayland/wlr_data_control/source.rs
@@ -0,0 +1,54 @@
+use smithay_client_toolkit::data_device::WritePipe;
+use std::os::fd::FromRawFd;
+use wayland_client::{Attached, DispatchData};
+use wayland_protocols::wlr::unstable::data_control::v1::client::{
+    zwlr_data_control_manager_v1::ZwlrDataControlManagerV1,
+    zwlr_data_control_source_v1::{Event, ZwlrDataControlSourceV1},
+};
+
+fn data_control_source_impl<F>(
+    source: &ZwlrDataControlSourceV1,
+    event: Event,
+    implem: &mut F,
+    ddata: DispatchData,
+) where
+    F: FnMut(String, WritePipe, DispatchData),
+{
+    match event {
+        Event::Send { mime_type, fd } => {
+            let pipe = unsafe { FromRawFd::from_raw_fd(fd) };
+            implem(mime_type, pipe, ddata);
+        }
+        Event::Cancelled => source.destroy(),
+        _ => unreachable!(),
+    }
+}
+
+pub struct DataControlSource {
+    pub(crate) source: ZwlrDataControlSourceV1,
+}
+
+impl DataControlSource {
+    pub fn new<F>(
+        manager: &Attached<ZwlrDataControlManagerV1>,
+        mime_types: Vec<String>,
+        mut callback: F,
+    ) -> Self
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static,
+    {
+        let source = manager.create_data_source();
+
+        source.quick_assign(move |source, evt, ddata| {
+            data_control_source_impl(&source, evt, &mut callback, ddata);
+        });
+
+        for mime_type in mime_types {
+            source.offer(mime_type);
+        }
+
+        Self {
+            source: source.detach(),
+        }
+    }
+}
--- a/src/clients/wayland/wlr_foreign_toplevel/handle.rs
+++ b/src/clients/wayland/wlr_foreign_toplevel/handle.rs
@@ -4,11 +4,13 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use tracing::trace;
 use wayland_client::{DispatchData, Main};
 use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::zwlr_foreign_toplevel_handle_v1::{Event, ZwlrForeignToplevelHandleV1};
+use crate::write_lock;

 const STATE_ACTIVE: u32 = 2;
 const STATE_FULLSCREEN: u32 = 3;

 static COUNTER: AtomicUsize = AtomicUsize::new(1);
+
 fn get_id() -> usize {
    COUNTER.fetch_add(1, Ordering::Relaxed)
 }
@@ -108,9 +110,9 @@ where
                None
            }
        }
-        Event::OutputEnter { output: _ } => None,
-        Event::OutputLeave { output: _ } => None,
-        Event::Parent { parent: _ } => None,
+        Event::OutputEnter { output: _ }
+        | Event::OutputLeave { output: _ }
+        | Event::Parent { parent: _ } => None,
        Event::Done => {
            if info.ready || info.app_id.is_empty() {
                None
@@ -119,6 +121,7 @@ where
                Some(ToplevelChange::New)
            }
        }
+
        _ => unreachable!(),
    };

@@ -140,9 +143,7 @@ impl Toplevel {
        let inner = Arc::new(RwLock::new(ToplevelInfo::new()));

        handle.quick_assign(move |_handle, event, ddata| {
-            let mut inner = inner
-                .write()
-                .expect("Failed to get write lock on toplevel inner state");
+            let mut inner = write_lock!(inner);
            toplevel_implem(event, &mut inner, &mut callback, ddata);
        });

--- a/src/clients/wayland/wlr_foreign_toplevel/manager.rs
+++ b/src/clients/wayland/wlr_foreign_toplevel/manager.rs
@@ -1,9 +1,8 @@
-use super::toplevel::{Toplevel, ToplevelEvent};
-use super::LazyGlobal;
+use super::handle::{Toplevel, ToplevelEvent};
+use crate::wayland::LazyGlobal;
 use smithay_client_toolkit::environment::{Environment, GlobalHandler};
 use std::cell::RefCell;
-use std::rc;
-use std::rc::Rc;
+use std::rc::{self, Rc};
 use tracing::warn;
 use wayland_client::protocol::wl_registry::WlRegistry;
 use wayland_client::{Attached, DispatchData};
@@ -58,7 +57,7 @@ impl GlobalHandler<ZwlrForeignToplevelManagerV1> for ToplevelHandler {
        if inner.registry.is_none() {
            inner.registry = Some(registry);
        }
-        if let LazyGlobal::Unknown = inner.manager {
+        if matches!(inner.manager, LazyGlobal::Unknown) {
            inner.manager = LazyGlobal::Seen { id, version }
        } else {
            warn!(
@@ -155,7 +154,7 @@ impl ToplevelHandling for ToplevelHandler {
    }
 }

-pub fn listen_for_toplevels<E, F>(env: Environment<E>, f: F) -> ToplevelStatusListener
+pub fn listen_for_toplevels<E, F>(env: &Environment<E>, f: F) -> ToplevelStatusListener
 where
    E: ToplevelHandling,
    F: FnMut(ZwlrForeignToplevelHandleV1, ToplevelEvent, DispatchData) + 'static,
--- a/src/clients/wayland/wlr_foreign_toplevel/mod.rs
+++ b/src/clients/wayland/wlr_foreign_toplevel/mod.rs
@@ -0,0 +1,39 @@
+use std::sync::RwLock;
+use indexmap::IndexMap;
+use tokio::sync::broadcast::Sender;
+use tracing::trace;
+use super::Env;
+use handle::{ToplevelEvent, ToplevelChange, ToplevelInfo};
+use manager::{ToplevelHandling, ToplevelStatusListener};
+use wayland_client::DispatchData;
+use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::zwlr_foreign_toplevel_handle_v1::ZwlrForeignToplevelHandleV1;
+use crate::{send, write_lock};
+
+pub mod handle;
+pub mod manager;
+
+impl ToplevelHandling for Env {
+    fn listen<F>(&mut self, f: F) -> ToplevelStatusListener
+    where
+        F: FnMut(ZwlrForeignToplevelHandleV1, ToplevelEvent, DispatchData) + 'static,
+    {
+        self.toplevel.listen(f)
+    }
+}
+
+pub fn update_toplevels(
+    toplevels: &RwLock<IndexMap<usize, (ToplevelInfo, ZwlrForeignToplevelHandleV1)>>,
+    handle: ZwlrForeignToplevelHandleV1,
+    event: ToplevelEvent,
+    tx: &Sender<ToplevelEvent>,
+) {
+    trace!("Received toplevel event: {:?}", event);
+
+    if event.change == ToplevelChange::Close {
+        write_lock!(toplevels).remove(&event.toplevel.id);
+    } else {
+        write_lock!(toplevels).insert(event.toplevel.id, (event.toplevel.clone(), handle));
+    }
+
+    send!(tx, event);
+}
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,189 +0,0 @@
-use crate::modules::clock::ClockModule;
-use crate::modules::custom::CustomModule;
-use crate::modules::focused::FocusedModule;
-use crate::modules::launcher::LauncherModule;
-use crate::modules::mpd::MpdModule;
-use crate::modules::script::ScriptModule;
-use crate::modules::sysinfo::SysInfoModule;
-use crate::modules::tray::TrayModule;
-use crate::modules::workspaces::WorkspacesModule;
-use crate::script::ScriptInput;
-use color_eyre::eyre::{Context, ContextCompat};
-use color_eyre::{eyre, Help, Report};
-use dirs::config_dir;
-use eyre::Result;
-use gtk::Orientation;
-use serde::Deserialize;
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-use std::{env, fs};
-use tracing::instrument;
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct CommonConfig {
-    pub show_if: Option<ScriptInput>,
-    pub on_click: Option<ScriptInput>,
-    pub tooltip: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ModuleConfig {
-    Clock(ClockModule),
-    Mpd(MpdModule),
-    Tray(TrayModule),
-    Workspaces(WorkspacesModule),
-    SysInfo(SysInfoModule),
-    Launcher(LauncherModule),
-    Script(ScriptModule),
-    Focused(FocusedModule),
-    Custom(CustomModule),
-}
-
-#[derive(Debug, Deserialize, Clone)]
-#[serde(untagged)]
-pub enum MonitorConfig {
-    Single(Config),
-    Multiple(Vec<Config>),
-}
-
-#[derive(Debug, Deserialize, Copy, Clone, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum BarPosition {
-    Top,
-    Bottom,
-    Left,
-    Right,
-}
-
-impl Default for BarPosition {
-    fn default() -> Self {
-        Self::Bottom
-    }
-}
-
-impl BarPosition {
-    pub fn get_orientation(self) -> Orientation {
-        if self == Self::Top || self == Self::Bottom {
-            Orientation::Horizontal
-        } else {
-            Orientation::Vertical
-        }
-    }
-
-    pub const fn get_angle(self) -> f64 {
-        match self {
-            Self::Top | Self::Bottom => 0.0,
-            Self::Left => 90.0,
-            Self::Right => 270.0,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct Config {
-    #[serde(default = "default_bar_position")]
-    pub position: BarPosition,
-    #[serde(default = "default_true")]
-    pub anchor_to_edges: bool,
-    #[serde(default = "default_bar_height")]
-    pub height: i32,
-
-    pub start: Option<Vec<ModuleConfig>>,
-    pub center: Option<Vec<ModuleConfig>>,
-    pub end: Option<Vec<ModuleConfig>>,
-
-    pub monitors: Option<HashMap<String, MonitorConfig>>,
-}
-
-const fn default_bar_position() -> BarPosition {
-    BarPosition::Bottom
-}
-
-const fn default_bar_height() -> i32 {
-    42
-}
-
-impl Config {
-    /// Attempts to load the config file from file,
-    /// parse it and return a new instance of `Self`.
-    #[instrument]
-    pub fn load() -> Result<Self> {
-        let config_path = env::var("IRONBAR_CONFIG").map_or_else(
-            |_| Self::try_find_config(),
-            |config_path| {
-                let path = PathBuf::from(config_path);
-                if path.exists() {
-                    Ok(path)
-                } else {
-                    Err(Report::msg(format!(
-                        "Specified config file does not exist: {}",
-                        path.display()
-                    ))
-                    .note("Config file was specified using `IRONBAR_CONFIG` environment variable"))
-                }
-            },
-        )?;
-
-        Self::load_file(&config_path)
-    }
-
-    /// Attempts to discover the location of the config file
-    /// by checking each valid format's extension.
-    ///
-    /// Returns the path of the first valid match, if any.
-    #[instrument]
-    fn try_find_config() -> Result<PathBuf> {
-        let config_dir = config_dir().wrap_err("Failed to locate user config dir")?;
-
-        let extensions = vec!["json", "toml", "yaml", "yml", "corn"];
-
-        let file = extensions.into_iter().find_map(|extension| {
-            let full_path = config_dir
-                .join("ironbar")
-                .join(format!("config.{extension}"));
-
-            if Path::exists(&full_path) {
-                Some(full_path)
-            } else {
-                None
-            }
-        });
-
-        file.map_or_else(
-            || {
-                Err(Report::msg("Could not find config file")
-                    .suggestion("Ironbar does not include a configuration out of the box")
-                    .suggestion("A guide on writing a config can be found on the wiki:")
-                    .suggestion("https://github.com/JakeStanger/ironbar/wiki/configuration-guide"))
-            },
-            Ok,
-        )
-    }
-
-    /// Loads the config file at the specified path
-    /// and parses it into `Self` based on its extension.
-    fn load_file(path: &Path) -> Result<Self> {
-        let file = fs::read(path).wrap_err("Failed to read config file")?;
-        let extension = path
-            .extension()
-            .unwrap_or_default()
-            .to_str()
-            .unwrap_or_default();
-
-        match extension {
-            "json" => serde_json::from_slice(&file).wrap_err("Invalid JSON config"),
-            "toml" => toml::from_slice(&file).wrap_err("Invalid TOML config"),
-            "yaml" | "yml" => serde_yaml::from_slice(&file).wrap_err("Invalid YAML config"),
-            "corn" => libcorn::from_slice(&file).wrap_err("Invalid Corn config"),
-            _ => unreachable!(),
-        }
-    }
-}
-
-pub const fn default_false() -> bool {
-    false
-}
-pub const fn default_true() -> bool {
-    true
-}
--- a/src/config/impl.rs
+++ b/src/config/impl.rs
@@ -0,0 +1,58 @@
+use super::{BarPosition, Config, MonitorConfig};
+use color_eyre::{Help, Report};
+use gtk::Orientation;
+use serde::{Deserialize, Deserializer};
+
+// Manually implement for better untagged enum error handling:
+// currently open pr: https://github.com/serde-rs/serde/pull/1544
+impl<'de> Deserialize<'de> for MonitorConfig {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let content =
+            <serde::__private::de::Content as serde::Deserialize>::deserialize(deserializer)?;
+
+        match <Config as serde::Deserialize>::deserialize(
+            serde::__private::de::ContentRefDeserializer::<D::Error>::new(&content),
+        ) {
+            Ok(config) => Ok(Self::Single(config)),
+            Err(outer) => match <Vec<Config> as serde::Deserialize>::deserialize(
+                serde::__private::de::ContentRefDeserializer::<D::Error>::new(&content),
+            ) {
+                Ok(config) => Ok(Self::Multiple(config)),
+                Err(inner) => {
+                    let report = Report::msg(format!(" multi-bar (c): {inner}").replace("An error occurred when deserializing: ", ""))
+                        .wrap_err(format!("single-bar (b): {outer}").replace("An error occurred when deserializing: ", ""))
+                        .wrap_err("An invalid config was found. The following errors were encountered:")
+                        .note("Both the single-bar (type b / error 1) and multi-bar (type c / error 2) config variants were tried. You can likely ignore whichever of these is not relevant to you.")
+                        .suggestion("Please see https://github.com/JakeStanger/ironbar/wiki/configuration-guide#2-pick-your-use-case for more info on the above");
+
+                    Err(serde::de::Error::custom(format!("{report:?}")))
+                }
+            },
+        }
+    }
+}
+
+impl BarPosition {
+    /// Gets the orientation the bar and widgets should use
+    /// based on this position.
+    pub fn get_orientation(self) -> Orientation {
+        if self == Self::Top || self == Self::Bottom {
+            Orientation::Horizontal
+        } else {
+            Orientation::Vertical
+        }
+    }
+
+    /// Gets the angle that label text should be displayed at
+    /// based on this position.
+    pub const fn get_angle(self) -> f64 {
+        match self {
+            Self::Top | Self::Bottom => 0.0,
+            Self::Left => 90.0,
+            Self::Right => 270.0,
+        }
+    }
+}
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -0,0 +1,124 @@
+mod r#impl;
+mod truncate;
+
+#[cfg(feature = "clipboard")]
+use crate::modules::clipboard::ClipboardModule;
+#[cfg(feature = "clock")]
+use crate::modules::clock::ClockModule;
+use crate::modules::custom::CustomModule;
+use crate::modules::focused::FocusedModule;
+use crate::modules::launcher::LauncherModule;
+#[cfg(feature = "music")]
+use crate::modules::music::MusicModule;
+use crate::modules::script::ScriptModule;
+#[cfg(feature = "sys_info")]
+use crate::modules::sysinfo::SysInfoModule;
+#[cfg(feature = "tray")]
+use crate::modules::tray::TrayModule;
+#[cfg(feature = "workspaces")]
+use crate::modules::workspaces::WorkspacesModule;
+use crate::script::ScriptInput;
+use serde::Deserialize;
+use std::collections::HashMap;
+
+pub use self::truncate::{EllipsizeMode, TruncateMode};
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct CommonConfig {
+    pub show_if: Option<ScriptInput>,
+
+    pub on_click_left: Option<ScriptInput>,
+    pub on_click_right: Option<ScriptInput>,
+    pub on_click_middle: Option<ScriptInput>,
+    pub on_scroll_up: Option<ScriptInput>,
+    pub on_scroll_down: Option<ScriptInput>,
+
+    pub tooltip: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum ModuleConfig {
+    #[cfg(feature = "clock")]
+    Clipboard(Box<ClipboardModule>),
+    #[cfg(feature = "clock")]
+    Clock(Box<ClockModule>),
+    Custom(Box<CustomModule>),
+    Focused(Box<FocusedModule>),
+    Launcher(Box<LauncherModule>),
+    #[cfg(feature = "music")]
+    Music(Box<MusicModule>),
+    Script(Box<ScriptModule>),
+    #[cfg(feature = "sys_info")]
+    SysInfo(Box<SysInfoModule>),
+    #[cfg(feature = "tray")]
+    Tray(Box<TrayModule>),
+    #[cfg(feature = "workspaces")]
+    Workspaces(Box<WorkspacesModule>),
+}
+
+#[derive(Debug, Clone)]
+pub enum MonitorConfig {
+    Single(Config),
+    Multiple(Vec<Config>),
+}
+
+#[derive(Debug, Deserialize, Copy, Clone, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum BarPosition {
+    Top,
+    Bottom,
+    Left,
+    Right,
+}
+
+impl Default for BarPosition {
+    fn default() -> Self {
+        Self::Bottom
+    }
+}
+
+#[derive(Debug, Default, Deserialize, Copy, Clone, PartialEq, Eq)]
+pub struct MarginConfig {
+    #[serde(default)]
+    pub bottom: i32,
+    #[serde(default)]
+    pub left: i32,
+    #[serde(default)]
+    pub right: i32,
+    #[serde(default)]
+    pub top: i32,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Config {
+    #[serde(default)]
+    pub position: BarPosition,
+    #[serde(default = "default_true")]
+    pub anchor_to_edges: bool,
+    #[serde(default = "default_bar_height")]
+    pub height: i32,
+    #[serde(default)]
+    pub margin: MarginConfig,
+
+    /// GTK icon theme to use.
+    pub icon_theme: Option<String>,
+
+    pub start: Option<Vec<ModuleConfig>>,
+    pub center: Option<Vec<ModuleConfig>>,
+    pub end: Option<Vec<ModuleConfig>>,
+
+    pub monitors: Option<HashMap<String, MonitorConfig>>,
+}
+
+const fn default_bar_height() -> i32 {
+    42
+}
+
+pub const fn default_false() -> bool {
+    false
+}
+
+pub const fn default_true() -> bool {
+    true
+}
--- a/src/config/truncate.rs
+++ b/src/config/truncate.rs
@@ -0,0 +1,66 @@
+use gtk::pango::EllipsizeMode as GtkEllipsizeMode;
+use gtk::prelude::*;
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize, Clone, Copy)]
+#[serde(rename_all = "snake_case")]
+pub enum EllipsizeMode {
+    Start,
+    Middle,
+    End,
+}
+
+impl From<EllipsizeMode> for GtkEllipsizeMode {
+    fn from(value: EllipsizeMode) -> Self {
+        match value {
+            EllipsizeMode::Start => Self::Start,
+            EllipsizeMode::Middle => Self::Middle,
+            EllipsizeMode::End => Self::End,
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Clone, Copy)]
+#[serde(untagged)]
+pub enum TruncateMode {
+    Auto(EllipsizeMode),
+    Length {
+        mode: EllipsizeMode,
+        length: Option<i32>,
+        max_length: Option<i32>,
+    },
+}
+
+impl TruncateMode {
+    const fn mode(&self) -> EllipsizeMode {
+        match self {
+            Self::Length { mode, .. } | Self::Auto(mode) => *mode,
+        }
+    }
+
+    const fn length(&self) -> Option<i32> {
+        match self {
+            Self::Auto(_) => None,
+            Self::Length { length, .. } => *length,
+        }
+    }
+
+    const fn max_length(&self) -> Option<i32> {
+        match self {
+            Self::Auto(_) => None,
+            Self::Length { max_length, .. } => *max_length,
+        }
+    }
+
+    pub fn truncate_label(&self, label: &gtk::Label) {
+        label.set_ellipsize(self.mode().into());
+
+        if let Some(length) = self.length() {
+            label.set_width_chars(length);
+        }
+
+        if let Some(length) = self.max_length() {
+            label.set_max_width_chars(length);
+        }
+    }
+}
--- a/src/desktop_file.rs
+++ b/src/desktop_file.rs
@@ -1,6 +1,3 @@
-use gtk::gdk_pixbuf::Pixbuf;
-use gtk::prelude::*;
-use gtk::{IconLookupFlags, IconTheme};
 use std::collections::HashMap;
 use std::fs::File;
 use std::io;
@@ -67,7 +64,7 @@ fn parse_desktop_file(path: PathBuf) -> io::Result<HashMap<String, String>> {
 }

 /// Attempts to get the icon name from the app's `.desktop` file.
-fn get_desktop_icon_name(app_id: &str) -> Option<String> {
+pub fn get_desktop_icon_name(app_id: &str) -> Option<String> {
    find_desktop_file(app_id).and_then(|file| {
        let map = parse_desktop_file(file);
        map.map_or(None, |map| {
@@ -75,66 +72,3 @@ fn get_desktop_icon_name(app_id: &str) -> Option<String> {
        })
    })
 }
-
-enum IconLocation {
-    Theme(String),
-    File(PathBuf),
-}
-
-/// Attempts to get the location of an icon.
-///
-/// Handles icons that are part of a GTK theme, icons specified as path
-/// and icons for steam games.
-fn get_icon_location(theme: &IconTheme, app_id: &str, size: i32) -> Option<IconLocation> {
-    let has_icon = theme
-        .lookup_icon(app_id, size, IconLookupFlags::empty())
-        .is_some();
-
-    if has_icon {
-        return Some(IconLocation::Theme(app_id.to_string()));
-    }
-
-    let is_steam_game = app_id.starts_with("steam_app_");
-    if is_steam_game {
-        let steam_id: String = app_id.chars().skip("steam_app_".len()).collect();
-
-        return match dirs::data_dir() {
-            Some(dir) => {
-                let path = dir.join(format!(
-                    "icons/hicolor/32x32/apps/steam_icon_{}.png",
-                    steam_id
-                ));
-
-                return Some(IconLocation::File(path));
-            }
-            None => None,
-        };
-    }
-
-    let icon_name = get_desktop_icon_name(app_id);
-    if let Some(icon_name) = icon_name {
-        let is_path = PathBuf::from(&icon_name).exists();
-
-        return if is_path {
-            Some(IconLocation::File(PathBuf::from(icon_name)))
-        } else {
-            return Some(IconLocation::Theme(icon_name));
-        };
-    }
-
-    None
-}
-
-/// Gets the icon associated with an app.
-pub fn get_icon(theme: &IconTheme, app_id: &str, size: i32) -> Option<Pixbuf> {
-    let icon_location = get_icon_location(theme, app_id, size);
-
-    match icon_location {
-        Some(IconLocation::Theme(icon_name)) => {
-            let icon = theme.load_icon(&icon_name, size, IconLookupFlags::FORCE_SIZE);
-            icon.map_or(None, |icon| icon)
-        }
-        Some(IconLocation::File(path)) => Pixbuf::from_file_at_scale(path, size, size, true).ok(),
-        None => None,
-    }
-}
--- a/src/dynamic_string.rs
+++ b/src/dynamic_string.rs
@@ -1,6 +1,6 @@
 use crate::script::{OutputStream, Script};
+use crate::{lock, send};
 use gtk::prelude::*;
-use indexmap::IndexMap;
 use std::sync::{Arc, Mutex};
 use tokio::spawn;

@@ -10,9 +10,7 @@ enum DynamicStringSegment {
    Dynamic(Script),
 }

-pub struct DynamicString {
-    // pub label: gtk::Label,
-}
+pub struct DynamicString;

 impl DynamicString {
    pub fn new<F>(input: &str, f: F) -> Self
@@ -61,40 +59,31 @@ impl DynamicString {
            chars.drain(..skip);
        }

-        let label_parts = Arc::new(Mutex::new(IndexMap::new()));
+        let label_parts = Arc::new(Mutex::new(Vec::new()));
        let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);

        for (i, segment) in segments.into_iter().enumerate() {
            match segment {
                DynamicStringSegment::Static(str) => {
-                    label_parts
-                        .lock()
-                        .expect("Failed to get lock on label parts")
-                        .insert(i, str);
+                    lock!(label_parts).push(str);
                }
                DynamicStringSegment::Dynamic(script) => {
                    let tx = tx.clone();
                    let label_parts = label_parts.clone();

+                    // insert blank value to preserve segment order
+                    lock!(label_parts).push(String::new());
+
                    spawn(async move {
                        script
                            .run(|(out, _)| {
                                if let OutputStream::Stdout(out) = out {
-                                    let mut label_parts = label_parts
-                                        .lock()
-                                        .expect("Failed to get lock on label parts");
+                                    let mut label_parts = lock!(label_parts);

-                                    label_parts
-                                        // .lock()
-                                        // .expect("Failed to get lock on label parts")
-                                        .insert(i, out);
+                                    let _ = std::mem::replace(&mut label_parts[i], out);

-                                    let string = label_parts
-                                        .iter()
-                                        .map(|(_, part)| part.as_str())
-                                        .collect::<String>();
-
-                                    tx.send(string).expect("Failed to send update");
+                                    let string = label_parts.join("");
+                                    send!(tx, string);
                                }
                            })
                            .await;
@@ -105,20 +94,13 @@ impl DynamicString {

        // initialize
        {
-            let label_parts = label_parts
-                .lock()
-                .expect("Failed to get lock on label parts")
-                .iter()
-                .map(|(_, part)| part.as_str())
-                .collect::<String>();
-
-            tx.send(label_parts).expect("Failed to send update");
+            let label_parts = lock!(label_parts).join("");
+            send!(tx, label_parts);
        }

        rx.attach(None, f);

-        // Self { label }
-        Self {}
+        Self
    }
 }

--- a/src/error.rs
+++ b/src/error.rs
@@ -0,0 +1,13 @@
+#[repr(i32)]
+pub enum ExitCode {
+    GtkDisplay = 1,
+    CreateBars = 2,
+    Config = 3,
+}
+
+pub const ERR_OUTPUTS: &str = "GTK and Sway are reporting a different set of outputs - this is a severe bug and should never happen";
+pub const ERR_MUTEX_LOCK: &str = "Failed to get lock on Mutex";
+pub const ERR_READ_LOCK: &str = "Failed to get read lock";
+pub const ERR_WRITE_LOCK: &str = "Failed to get write lock";
+pub const ERR_CHANNEL_SEND: &str = "Failed to send message to channel";
+pub const ERR_CHANNEL_RECV: &str = "Failed to receive message from channel";
--- a/src/image/gtk.rs
+++ b/src/image/gtk.rs
@@ -0,0 +1,56 @@
+use super::ImageProvider;
+use gtk::prelude::*;
+use gtk::{Button, IconTheme, Image, Label, Orientation};
+use tracing::error;
+
+#[cfg(any(feature = "music", feature = "workspaces", feature = "clipboard"))]
+pub fn new_icon_button(input: &str, icon_theme: &IconTheme, size: i32) -> Button {
+    let button = Button::new();
+
+    if ImageProvider::is_definitely_image_input(input) {
+        let image = Image::new();
+        image.set_widget_name("image");
+
+        match ImageProvider::parse(input, icon_theme, size)
+            .and_then(|provider| provider.load_into_image(image.clone()))
+        {
+            Ok(_) => {
+                button.set_image(Some(&image));
+                button.set_always_show_image(true);
+            }
+            Err(err) => {
+                error!("{err:?}");
+                button.set_label(input);
+            }
+        }
+    } else {
+        button.set_label(input);
+    }
+
+    button
+}
+
+#[cfg(feature = "music")]
+pub fn new_icon_label(input: &str, icon_theme: &IconTheme, size: i32) -> gtk::Box {
+    let container = gtk::Box::new(Orientation::Horizontal, 0);
+
+    if ImageProvider::is_definitely_image_input(input) {
+        let image = Image::new();
+        image.set_widget_name("image");
+
+        container.add(&image);
+
+        if let Err(err) = ImageProvider::parse(input, icon_theme, size)
+            .and_then(|provider| provider.load_into_image(image))
+        {
+            error!("{err:?}");
+        }
+    } else {
+        let label = Label::new(Some(input));
+        label.set_widget_name("label");
+
+        container.add(&label);
+    }
+
+    container
+}
--- a/src/image/mod.rs
+++ b/src/image/mod.rs
@@ -0,0 +1,7 @@
+#[cfg(any(feature = "music", feature = "workspaces", feature = "clipboard"))]
+mod gtk;
+mod provider;
+
+#[cfg(any(feature = "music", feature = "workspaces"))]
+pub use self::gtk::*;
+pub use provider::ImageProvider;
--- a/src/image/provider.rs
+++ b/src/image/provider.rs
@@ -0,0 +1,199 @@
+use crate::desktop_file::get_desktop_icon_name;
+use cfg_if::cfg_if;
+use color_eyre::{Help, Report, Result};
+use gtk::gdk_pixbuf::Pixbuf;
+use gtk::prelude::*;
+use gtk::{IconLookupFlags, IconTheme};
+use std::path::{Path, PathBuf};
+
+cfg_if!(
+    if #[cfg(feature = "http")] {
+        use crate::send;
+        use gtk::gio::{Cancellable, MemoryInputStream};
+        use tokio::spawn;
+        use tracing::error;
+    }
+);
+
+#[derive(Debug)]
+enum ImageLocation<'a> {
+    Icon {
+        name: String,
+        theme: &'a IconTheme,
+    },
+    Local(PathBuf),
+    Steam(String),
+    #[cfg(feature = "http")]
+    Remote(reqwest::Url),
+}
+
+pub struct ImageProvider<'a> {
+    location: ImageLocation<'a>,
+    size: i32,
+}
+
+impl<'a> ImageProvider<'a> {
+    /// Attempts to parse the image input to find its location.
+    /// Errors if no valid location type can be found.
+    ///
+    /// Note this checks that icons exist in theme, or files exist on disk
+    /// but no other check is performed.
+    pub fn parse(input: &str, theme: &'a IconTheme, size: i32) -> Result<Self> {
+        let location = Self::get_location(input, theme, size)?;
+        Ok(Self { location, size })
+    }
+
+    /// Returns true if the input starts with a prefix
+    /// that is supported by the parser
+    /// (ie the parser would not fallback to checking the input).
+    #[cfg(any(feature = "music", feature = "workspaces"))]
+    pub fn is_definitely_image_input(input: &str) -> bool {
+        input.starts_with("icon:")
+            || input.starts_with("file://")
+            || input.starts_with("http://")
+            || input.starts_with("https://")
+    }
+
+    fn get_location(input: &str, theme: &'a IconTheme, size: i32) -> Result<ImageLocation<'a>> {
+        let (input_type, input_name) = input
+            .split_once(':')
+            .map_or((None, input), |(t, n)| (Some(t), n));
+
+        match input_type {
+            Some(input_type) if input_type == "icon" => Ok(ImageLocation::Icon {
+                name: input_name.to_string(),
+                theme,
+            }),
+            Some(input_type) if input_type == "file" => Ok(ImageLocation::Local(PathBuf::from(
+                input_name[2..].to_string(),
+            ))),
+            #[cfg(feature = "http")]
+            Some(input_type) if input_type == "http" || input_type == "https" => {
+                Ok(ImageLocation::Remote(input.parse()?))
+            }
+            None if input.starts_with("steam_app_") => Ok(ImageLocation::Steam(
+                input_name.chars().skip("steam_app_".len()).collect(),
+            )),
+            None if theme
+                .lookup_icon(input, size, IconLookupFlags::empty())
+                .is_some() =>
+            {
+                Ok(ImageLocation::Icon {
+                    name: input_name.to_string(),
+                    theme,
+                })
+            }
+            Some(input_type) => Err(Report::msg(format!("Unsupported image type: {input_type}"))
+                .note("You may need to recompile with support if available")),
+            None if PathBuf::from(input_name).is_file() => {
+                Ok(ImageLocation::Local(PathBuf::from(input_name)))
+            }
+            None => get_desktop_icon_name(input_name).map_or_else(
+                || Err(Report::msg(format!("Unknown image type: '{input}'"))),
+                |input| Self::get_location(&input, theme, size),
+            ),
+        }
+    }
+
+    /// Attempts to fetch the image from the location
+    /// and load it into the provided `GTK::Image` widget.
+    pub fn load_into_image(&self, image: gtk::Image) -> Result<()> {
+        // handle remote locations async to avoid blocking UI thread while downloading
+        #[cfg(feature = "http")]
+        if let ImageLocation::Remote(url) = &self.location {
+            let url = url.clone();
+            let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);
+
+            spawn(async move {
+                let bytes = Self::get_bytes_from_http(url).await;
+                if let Ok(bytes) = bytes {
+                    send!(tx, bytes);
+                }
+            });
+
+            {
+                let size = self.size;
+                rx.attach(None, move |bytes| {
+                    let stream = MemoryInputStream::from_bytes(&bytes);
+                    let pixbuf = Pixbuf::from_stream_at_scale(
+                        &stream,
+                        size,
+                        size,
+                        true,
+                        Some(&Cancellable::new()),
+                    );
+
+                    match pixbuf {
+                        Ok(pixbuf) => image.set_pixbuf(Some(&pixbuf)),
+                        Err(err) => error!("{err:?}"),
+                    }
+
+                    Continue(false)
+                });
+            }
+        } else {
+            self.load_into_image_sync(&image)?;
+        };
+
+        #[cfg(not(feature = "http"))]
+        self.load_into_image_sync(&image)?;
+
+        Ok(())
+    }
+
+    fn load_into_image_sync(&self, image: &gtk::Image) -> Result<()> {
+        let pixbuf = match &self.location {
+            ImageLocation::Icon { name, theme } => self.get_from_icon(name, theme),
+            ImageLocation::Local(path) => self.get_from_file(path),
+            ImageLocation::Steam(steam_id) => self.get_from_steam_id(steam_id),
+            #[cfg(feature = "http")]
+            _ => unreachable!(), // handled above
+        }?;
+
+        image.set_pixbuf(Some(&pixbuf));
+
+        Ok(())
+    }
+
+    /// Attempts to get a `Pixbuf` from the GTK icon theme.
+    fn get_from_icon(&self, name: &str, theme: &IconTheme) -> Result<Pixbuf> {
+        let pixbuf = match theme.lookup_icon(name, self.size, IconLookupFlags::empty()) {
+            Some(_) => theme.load_icon(name, self.size, IconLookupFlags::FORCE_SIZE),
+            None => Ok(None),
+        }?;
+
+        pixbuf.map_or_else(
+            || Err(Report::msg("Icon theme does not contain icon '{name}'")),
+            Ok,
+        )
+    }
+
+    /// Attempts to get a `Pixbuf` from a local file.
+    fn get_from_file(&self, path: &Path) -> Result<Pixbuf> {
+        let pixbuf = Pixbuf::from_file_at_scale(path, self.size, self.size, true)?;
+        Ok(pixbuf)
+    }
+
+    /// Attempts to get a `Pixbuf` from a local file,
+    /// using the Steam game ID to look it up.
+    fn get_from_steam_id(&self, steam_id: &str) -> Result<Pixbuf> {
+        // TODO: Can we load this from icon theme with app id `steam_icon_{}`?
+        let path = dirs::data_dir().map_or_else(
+            || Err(Report::msg("Missing XDG data dir")),
+            |dir| {
+                Ok(dir.join(format!(
+                    "icons/hicolor/32x32/apps/steam_icon_{steam_id}.png"
+                )))
+            },
+        )?;
+
+        self.get_from_file(&path)
+    }
+
+    /// Attempts to get `Bytes` from an HTTP resource asynchronously.
+    #[cfg(feature = "http")]
+    async fn get_bytes_from_http(url: reqwest::Url) -> Result<glib::Bytes> {
+        let bytes = reqwest::get(url).await?.bytes().await?;
+        Ok(glib::Bytes::from_owned(bytes))
+    }
+}
--- a/src/logging.rs
+++ b/src/logging.rs
@@ -1,7 +1,8 @@
 use color_eyre::Result;
 use dirs::data_dir;
-use std::env;
+use std::{env, panic};
 use strip_ansi_escapes::Writer;
+use tracing::error;
 use tracing_appender::non_blocking::{NonBlocking, WorkerGuard};
 use tracing_error::ErrorLayer;
 use tracing_subscriber::fmt::{Layer, MakeWriter};
@@ -26,11 +27,34 @@ impl<'a> MakeWriter<'a> for MakeFileWriter {
    }
 }

+pub fn install_logging() -> Result<WorkerGuard> {
+    // Disable backtraces by default
+    if env::var("RUST_LIB_BACKTRACE").is_err() {
+        env::set_var("RUST_LIB_BACKTRACE", "0");
+    }
+
+    // keep guard in scope
+    // otherwise file logging drops
+    let guard = install_tracing()?;
+
+    let hook_builder = color_eyre::config::HookBuilder::default();
+    let (panic_hook, eyre_hook) = hook_builder.into_hooks();
+
+    eyre_hook.install()?;
+
+    // custom hook allows tracing_appender to capture panics
+    panic::set_hook(Box::new(move |panic_info| {
+        error!("{}", panic_hook.panic_report(panic_info));
+    }));
+
+    Ok(guard)
+}
+
 /// Installs tracing into the current application.
 ///
 /// The returned `WorkerGuard` must remain in scope
 /// for the lifetime of the application for logging to file to work.
-pub fn install_tracing() -> Result<WorkerGuard> {
+fn install_tracing() -> Result<WorkerGuard> {
    const DEFAULT_LOG: &str = "info";
    const DEFAULT_FILE_LOG: &str = "warn";

--- a/src/macros.rs
+++ b/src/macros.rs
@@ -0,0 +1,89 @@
+/// Sends a message on an asynchronous `Sender` using `send()`
+/// Panics if the message cannot be sent.
+///
+/// Usage:
+///
+/// ```rs
+/// send_async!(tx, "my message");
+/// ```
+#[macro_export]
+macro_rules! send_async {
+    ($tx:expr, $msg:expr) => {
+        $tx.send($msg).await.expect($crate::error::ERR_CHANNEL_SEND)
+    };
+}
+
+/// Sends a message on an synchronous `Sender` using `send()`
+/// Panics if the message cannot be sent.
+///
+/// Usage:
+///
+/// ```rs
+/// send!(tx, "my message");
+/// ```
+#[macro_export]
+macro_rules! send {
+    ($tx:expr, $msg:expr) => {
+        $tx.send($msg).expect($crate::error::ERR_CHANNEL_SEND)
+    };
+}
+
+/// Sends a message on an synchronous `Sender` using `try_send()`
+/// Panics if the message cannot be sent.
+///
+/// Usage:
+///
+/// ```rs
+/// try_send!(tx, "my message");
+/// ```
+#[macro_export]
+macro_rules! try_send {
+    ($tx:expr, $msg:expr) => {
+        $tx.try_send($msg).expect($crate::error::ERR_CHANNEL_SEND)
+    };
+}
+
+/// Locks a `Mutex`.
+/// Panics if the `Mutex` cannot be locked.
+///
+/// Usage:
+///
+/// ```rs
+/// let mut val = lock!(my_mutex);
+/// ```
+#[macro_export]
+macro_rules! lock {
+    ($mutex:expr) => {
+        $mutex.lock().expect($crate::error::ERR_MUTEX_LOCK)
+    };
+}
+
+/// Gets a read lock on a `RwLock`.
+/// Panics if the `RwLock` cannot be locked.
+///
+/// Usage:
+///
+/// ```rs
+/// let val = read_lock!(my_rwlock);
+/// ```
+#[macro_export]
+macro_rules! read_lock {
+    ($rwlock:expr) => {
+        $rwlock.read().expect($crate::error::ERR_READ_LOCK)
+    };
+}
+
+/// Gets a write lock on a `RwLock`.
+/// Panics if the `RwLock` cannot be locked.
+///
+/// Usage:
+///
+/// ```rs
+/// let mut val = write_lock!(my_rwlock);
+/// ```
+#[macro_export]
+macro_rules! write_lock {
+    ($rwlock:expr) => {
+        $rwlock.write().expect($crate::error::ERR_WRITE_LOCK)
+    };
+}
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,9 +2,12 @@ mod bar;
 mod bridge_channel;
 mod clients;
 mod config;
+mod desktop_file;
 mod dynamic_string;
-mod icon;
+mod error;
+mod image;
 mod logging;
+mod macros;
 mod modules;
 mod popup;
 mod script;
@@ -19,78 +22,62 @@ use dirs::config_dir;
 use gtk::gdk::Display;
 use gtk::prelude::*;
 use gtk::Application;
+use std::env;
 use std::future::Future;
 use std::path::PathBuf;
 use std::process::exit;
-use std::{env, panic};
 use tokio::runtime::Handle;
 use tokio::task::block_in_place;

-use crate::logging::install_tracing;
+use crate::error::ExitCode;
 use clients::wayland::{self, WaylandClient};
 use tracing::{debug, error, info};
+use universal_config::ConfigLoader;

+const GTK_APP_ID: &str = "dev.jstanger.ironbar";
 const VERSION: &str = env!("CARGO_PKG_VERSION");

-#[repr(i32)]
-enum ErrorCode {
-    GtkDisplay = 1,
-    CreateBars = 2,
-    Config = 3,
-}
-
 #[tokio::main]
 async fn main() -> Result<()> {
-    // Disable backtraces by default
-    if env::var("RUST_LIB_BACKTRACE").is_err() {
-        env::set_var("RUST_LIB_BACKTRACE", "0");
-    }
-
-    // keep guard in scope
-    // otherwise file logging drops
-    let _guard = install_tracing()?;
-
-    let hook_builder = color_eyre::config::HookBuilder::default();
-    let (panic_hook, eyre_hook) = hook_builder.into_hooks();
-
-    eyre_hook.install()?;
-
-    // custom hook allows tracing_appender to capture panics
-    panic::set_hook(Box::new(move |panic_info| {
-        error!("{}", panic_hook.panic_report(panic_info));
-    }));
+    let _guard = logging::install_logging();

    info!("Ironbar version {}", VERSION);
    info!("Starting application");

+    clients::volume::pulse_bak::test();
+
    let wayland_client = wayland::get_client().await;

-    let app = Application::builder()
-        .application_id("dev.jstanger.ironbar")
-        .build();
+    let app = Application::builder().application_id(GTK_APP_ID).build();

    app.connect_activate(move |app| {
        let display = Display::default().map_or_else(
            || {
                let report = Report::msg("Failed to get default GTK display");
                error!("{:?}", report);
-                exit(ErrorCode::GtkDisplay as i32)
+                exit(ExitCode::GtkDisplay as i32)
            },
            |display| display,
        );

-        let config = match Config::load() {
+        let config_res = match env::var("IRONBAR_CONFIG") {
+            Ok(path) => ConfigLoader::load(path),
+            Err(_) => ConfigLoader::new("ironbar").find_and_load(),
+        };
+
+        let config = match config_res {
            Ok(config) => config,
            Err(err) => {
                error!("{:?}", err);
-                exit(ErrorCode::Config as i32)
+                exit(ExitCode::Config as i32)
            }
        };
+
        debug!("Loaded config file");

        if let Err(err) = create_bars(app, &display, wayland_client, &config) {
            error!("{:?}", err);
-            exit(ErrorCode::CreateBars as i32);
+            exit(ExitCode::CreateBars as i32);
        }

        debug!("Created bars");
@@ -101,7 +88,7 @@ async fn main() -> Result<()> {
                    || {
                        let report = Report::msg("Failed to locate user config dir");
                        error!("{:?}", report);
-                        exit(ErrorCode::CreateBars as i32);
+                        exit(ExitCode::CreateBars as i32);
                    },
                    |dir| dir.join("ironbar").join("style.css"),
                )
@@ -136,11 +123,14 @@ fn create_bars(
    let num_monitors = display.n_monitors();

    for i in 0..num_monitors {
-        let monitor = display.monitor(i).ok_or_else(|| Report::msg("GTK and Sway are reporting a different set of outputs - this is a severe bug and should never happen"))?;
-        let output = outputs.get(i as usize).ok_or_else(|| Report::msg("GTK and Sway are reporting a different set of outputs - this is a severe bug and should never happen"))?;
+        let monitor = display
+            .monitor(i)
+            .ok_or_else(|| Report::msg(error::ERR_OUTPUTS))?;
+        let output = outputs
+            .get(i as usize)
+            .ok_or_else(|| Report::msg(error::ERR_OUTPUTS))?;
        let monitor_name = &output.name;

-        // TODO: Could we use an Arc<Config> or `Cow<Config>` here to avoid cloning?
        config.monitors.as_ref().map_or_else(
            || {
                info!("Creating bar on '{}'", monitor_name);
@@ -178,6 +168,8 @@ fn create_bars(
 /// Do note it must be called from within a Tokio runtime still.
 ///
 /// Use sparingly! Prefer async functions wherever possible.
+///
+/// TODO: remove all instances of this once async trait funcs are stable
 pub fn await_sync<F: Future>(f: F) -> F::Output {
    block_in_place(|| Handle::current().block_on(f))
 }
--- a/src/modules/clipboard.rs
+++ b/src/modules/clipboard.rs
@@ -0,0 +1,315 @@
+use crate::clients::clipboard::{self, ClipboardEvent};
+use crate::clients::wayland::{ClipboardItem, ClipboardValue};
+use crate::config::{CommonConfig, TruncateMode};
+use crate::image::new_icon_button;
+use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
+use crate::popup::Popup;
+use crate::try_send;
+use gtk::gdk_pixbuf::Pixbuf;
+use gtk::gio::{Cancellable, MemoryInputStream};
+use gtk::prelude::*;
+use gtk::{Button, EventBox, Image, Label, Orientation, RadioButton, Widget};
+use serde::Deserialize;
+use std::collections::HashMap;
+use std::sync::Arc;
+use tokio::spawn;
+use tokio::sync::mpsc::{Receiver, Sender};
+use tracing::{debug, error};
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct ClipboardModule {
+    #[serde(default = "default_icon")]
+    icon: String,
+
+    #[serde(default = "default_max_items")]
+    max_items: usize,
+
+    // -- Common --
+    truncate: Option<TruncateMode>,
+
+    #[serde(flatten)]
+    pub common: Option<CommonConfig>,
+}
+
+fn default_icon() -> String {
+    String::from("󰨸")
+}
+
+const fn default_max_items() -> usize {
+    10
+}
+
+#[derive(Debug, Clone)]
+pub enum ControllerEvent {
+    Add(usize, Arc<ClipboardItem>),
+    Remove(usize),
+    Activate(usize),
+    Deactivate,
+}
+
+#[derive(Debug, Clone)]
+pub enum UIEvent {
+    Copy(usize),
+    Remove(usize),
+}
+
+impl Module<Button> for ClipboardModule {
+    type SendMessage = ControllerEvent;
+    type ReceiveMessage = UIEvent;
+
+    fn name() -> &'static str {
+        "clipboard"
+    }
+
+    fn spawn_controller(
+        &self,
+        _info: &ModuleInfo,
+        tx: Sender<ModuleUpdateEvent<Self::SendMessage>>,
+        mut rx: Receiver<Self::ReceiveMessage>,
+    ) -> color_eyre::Result<()> {
+        let max_items = self.max_items;
+
+        // listen to clipboard events
+        spawn(async move {
+            let mut rx = {
+                let client = clipboard::get_client();
+                client.subscribe(max_items).await
+            };
+
+            while let Some(event) = rx.recv().await {
+                match event {
+                    ClipboardEvent::Add(item) => {
+                        let msg = match &item.value {
+                            ClipboardValue::Other => {
+                                ModuleUpdateEvent::Update(ControllerEvent::Deactivate)
+                            }
+                            _ => ModuleUpdateEvent::Update(ControllerEvent::Add(item.id, item)),
+                        };
+                        try_send!(tx, msg);
+                    }
+                    ClipboardEvent::Remove(id) => {
+                        try_send!(tx, ModuleUpdateEvent::Update(ControllerEvent::Remove(id)));
+                    }
+                    ClipboardEvent::Activate(id) => {
+                        try_send!(tx, ModuleUpdateEvent::Update(ControllerEvent::Activate(id)));
+                    }
+                }
+            }
+
+            error!("Clipboard client unexpectedly closed");
+        });
+
+        // listen to ui events
+        spawn(async move {
+            while let Some(event) = rx.recv().await {
+                let client = clipboard::get_client();
+                match event {
+                    UIEvent::Copy(id) => client.copy(id).await,
+                    UIEvent::Remove(id) => client.remove(id),
+                }
+            }
+        });
+
+        Ok(())
+    }
+
+    fn into_widget(
+        self,
+        context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
+        info: &ModuleInfo,
+    ) -> color_eyre::Result<ModuleWidget<Button>> {
+        let position = info.bar_position;
+
+        let button = new_icon_button(&self.icon, info.icon_theme, 32);
+        button.style_context().add_class("btn");
+
+        button.connect_clicked(move |button| {
+            let pos = Popup::button_pos(button, position.get_orientation());
+            try_send!(context.tx, ModuleUpdateEvent::TogglePopup(pos));
+        });
+
+        // we need to bind to the receiver as the channel does not open
+        // until the popup is first opened.
+        context.widget_rx.attach(None, |_| Continue(true));
+
+        Ok(ModuleWidget {
+            widget: button,
+            popup: self.into_popup(context.controller_tx, context.popup_rx, info),
+        })
+    }
+
+    fn into_popup(
+        self,
+        tx: Sender<Self::ReceiveMessage>,
+        rx: glib::Receiver<Self::SendMessage>,
+        _info: &ModuleInfo,
+    ) -> Option<gtk::Box>
+    where
+        Self: Sized,
+    {
+        let container = gtk::Box::builder()
+            .orientation(Orientation::Vertical)
+            .spacing(10)
+            .name("popup-clipboard")
+            .build();
+
+        let entries = gtk::Box::new(Orientation::Vertical, 5);
+        container.add(&entries);
+
+        let hidden_option = RadioButton::new();
+        entries.add(&hidden_option);
+
+        let mut items = HashMap::new();
+
+        {
+            let hidden_option = hidden_option.clone();
+            rx.attach(None, move |event| {
+                match event {
+                    ControllerEvent::Add(id, item) => {
+                        debug!("Adding new value with ID {}", id);
+
+                        let row = gtk::Box::new(Orientation::Horizontal, 0);
+                        row.style_context().add_class("item");
+
+                        let button = match &item.value {
+                            ClipboardValue::Text(value) => {
+                                let button = RadioButton::from_widget(&hidden_option);
+
+                                let label = Label::new(Some(value));
+                                button.add(&label);
+
+                                if let Some(truncate) = self.truncate {
+                                    truncate.truncate_label(&label);
+                                }
+
+                                button.style_context().add_class("text");
+                                button
+                            }
+                            ClipboardValue::Image(bytes) => {
+                                let stream = MemoryInputStream::from_bytes(bytes);
+                                let pixbuf = Pixbuf::from_stream_at_scale(
+                                    &stream,
+                                    128,
+                                    64,
+                                    true,
+                                    Some(&Cancellable::new()),
+                                )
+                                .expect("Failed to read Pixbuf from stream");
+                                let image = Image::from_pixbuf(Some(&pixbuf));
+
+                                let button = RadioButton::from_widget(&hidden_option);
+                                button.set_image(Some(&image));
+                                button.set_always_show_image(true);
+                                button.style_context().add_class("image");
+
+                                button
+                            }
+                            ClipboardValue::Other => unreachable!(),
+                        };
+
+                        button.style_context().add_class("btn");
+                        button.set_active(true); // if just added, should be on clipboard
+
+                        let button_wrapper = EventBox::new();
+                        button_wrapper.add(&button);
+
+                        button_wrapper.set_widget_name(&format!("copy-{id}"));
+                        button_wrapper.set_above_child(true);
+
+                        {
+                            let tx = tx.clone();
+                            button_wrapper.connect_button_press_event(
+                                move |button_wrapper, event| {
+                                    // left click
+                                    if event.button() == 1 {
+                                        let id = get_button_id(button_wrapper)
+                                            .expect("Failed to get id from button name");
+
+                                        debug!("Copying item with id: {id}");
+                                        try_send!(tx, UIEvent::Copy(id));
+                                    }
+
+                                    Inhibit(true)
+                                },
+                            );
+                        }
+
+                        let remove_button = Button::with_label("x");
+                        remove_button.set_widget_name(&format!("remove-{id}"));
+                        remove_button.style_context().add_class("btn-remove");
+
+                        {
+                            let tx = tx.clone();
+                            let entries = entries.clone();
+                            let row = row.clone();
+
+                            remove_button.connect_clicked(move |button| {
+                                let id = get_button_id(button)
+                                    .expect("Failed to get id from button name");
+
+                                debug!("Removing item with id: {id}");
+                                try_send!(tx, UIEvent::Remove(id));
+
+                                entries.remove(&row);
+                            });
+                        }
+
+                        row.add(&button_wrapper);
+                        row.pack_end(&remove_button, false, false, 0);
+
+                        entries.add(&row);
+                        entries.reorder_child(&row, 0);
+                        row.show_all();
+
+                        items.insert(id, (row, button));
+                    }
+                    ControllerEvent::Remove(id) => {
+                        debug!("Removing option with ID {id}");
+                        let row = items.remove(&id);
+                        if let Some((row, button)) = row {
+                            if button.is_active() {
+                                hidden_option.set_active(true);
+                            }
+
+                            entries.remove(&row);
+                        }
+                    }
+                    ControllerEvent::Activate(id) => {
+                        debug!("Activating option with ID {id}");
+
+                        hidden_option.set_active(false);
+                        let row = items.get(&id);
+                        if let Some((_, button)) = row {
+                            button.set_active(true);
+                        }
+                    }
+                    ControllerEvent::Deactivate => {
+                        debug!("Deactivating current option");
+                        hidden_option.set_active(true);
+                    }
+                }
+
+                Continue(true)
+            });
+        }
+
+        container.show_all();
+        hidden_option.hide();
+
+        Some(container)
+    }
+}
+
+/// Gets the ID from a widget's name.
+///
+/// This expects the button name to be
+/// in the format `<purpose>-<id>`.
+fn get_button_id<W>(button_wrapper: &W) -> Option<usize>
+where
+    W: IsA<Widget>,
+{
+    button_wrapper
+        .widget_name()
+        .split_once('-')
+        .and_then(|(_, id)| id.parse().ok())
+}
--- a/src/modules/clock.rs
+++ b/src/modules/clock.rs
@@ -1,6 +1,7 @@
 use crate::config::CommonConfig;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::popup::Popup;
+use crate::{send_async, try_send};
 use chrono::{DateTime, Local};
 use color_eyre::Result;
 use glib::Continue;
@@ -22,7 +23,7 @@ pub struct ClockModule {
    format: String,

    #[serde(flatten)]
-    pub common: CommonConfig,
+    pub common: Option<CommonConfig>,
 }

 fn default_format() -> String {
@@ -33,6 +34,10 @@ impl Module<Button> for ClockModule {
    type SendMessage = DateTime<Local>;
    type ReceiveMessage = ();

+    fn name() -> &'static str {
+        "clock"
+    }
+
    fn spawn_controller(
        &self,
        _info: &ModuleInfo,
@@ -42,9 +47,7 @@ impl Module<Button> for ClockModule {
        spawn(async move {
            loop {
                let date = Local::now();
-                tx.send(ModuleUpdateEvent::Update(date))
-                    .await
-                    .expect("Failed to send date");
+                send_async!(tx, ModuleUpdateEvent::Update(date));
                sleep(tokio::time::Duration::from_millis(500)).await;
            }
        });
@@ -64,13 +67,10 @@ impl Module<Button> for ClockModule {

        let orientation = info.bar_position.get_orientation();
        button.connect_clicked(move |button| {
-            context
-                .tx
-                .try_send(ModuleUpdateEvent::TogglePopup(Popup::button_pos(
-                    button,
-                    orientation,
-                )))
-                .expect("Failed to toggle popup");
+            try_send!(
+                context.tx,
+                ModuleUpdateEvent::TogglePopup(Popup::button_pos(button, orientation))
+            );
        });

        let format = self.format.clone();
@@ -82,7 +82,7 @@ impl Module<Button> for ClockModule {
            });
        }

-        let popup = self.into_popup(context.controller_tx, context.popup_rx);
+        let popup = self.into_popup(context.controller_tx, context.popup_rx, info);

        Ok(ModuleWidget {
            widget: button,
@@ -94,6 +94,7 @@ impl Module<Button> for ClockModule {
        self,
        _tx: mpsc::Sender<Self::ReceiveMessage>,
        rx: glib::Receiver<Self::SendMessage>,
+        _info: &ModuleInfo,
    ) -> Option<gtk::Box> {
        let container = gtk::Box::builder()
            .orientation(Orientation::Vertical)
@@ -119,6 +120,8 @@ impl Module<Button> for ClockModule {
            });
        }

+        container.show_all();
+
        Some(container)
    }
 }
--- a/src/modules/custom.rs
+++ b/src/modules/custom.rs
@@ -1,11 +1,13 @@
 use crate::config::CommonConfig;
 use crate::dynamic_string::DynamicString;
+use crate::image::ImageProvider;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::popup::{ButtonGeometry, Popup};
 use crate::script::Script;
+use crate::{send_async, try_send};
 use color_eyre::{Report, Result};
 use gtk::prelude::*;
-use gtk::{Button, Label, Orientation};
+use gtk::{Button, IconTheme, Label, Orientation};
 use serde::Deserialize;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender};
@@ -21,7 +23,7 @@ pub struct CustomModule {
    popup: Option<Vec<Widget>>,

    #[serde(flatten)]
-    pub common: CommonConfig,
+    pub common: Option<CommonConfig>,
 }

 /// Attempts to parse an `Orientation` from `String`
@@ -45,6 +47,8 @@ pub struct Widget {
    class: Option<String>,
    on_click: Option<String>,
    orientation: Option<String>,
+    src: Option<String>,
+    size: Option<i32>,
 }

 /// Supported GTK widget types
@@ -54,20 +58,33 @@ pub enum WidgetType {
    Box,
    Label,
    Button,
+    Image,
 }

 impl Widget {
    /// Creates this widget and adds it to the parent container
-    fn add_to(self, parent: &gtk::Box, tx: Sender<ExecEvent>, bar_orientation: Orientation) {
+    fn add_to(
+        self,
+        parent: &gtk::Box,
+        tx: Sender<ExecEvent>,
+        bar_orientation: Orientation,
+        icon_theme: &IconTheme,
+    ) {
        match self.widget_type {
-            WidgetType::Box => parent.add(&self.into_box(&tx, bar_orientation)),
+            WidgetType::Box => parent.add(&self.into_box(&tx, bar_orientation, icon_theme)),
            WidgetType::Label => parent.add(&self.into_label()),
            WidgetType::Button => parent.add(&self.into_button(tx, bar_orientation)),
+            WidgetType::Image => parent.add(&self.into_image(icon_theme)),
        }
    }

    /// Creates a `gtk::Box` from this widget
-    fn into_box(self, tx: &Sender<ExecEvent>, bar_orientation: Orientation) -> gtk::Box {
+    fn into_box(
+        self,
+        tx: &Sender<ExecEvent>,
+        bar_orientation: Orientation,
+        icon_theme: &IconTheme,
+    ) -> gtk::Box {
        let mut builder = gtk::Box::builder();

        if let Some(name) = self.name {
@@ -86,9 +103,9 @@ impl Widget {
        }

        if let Some(widgets) = self.widgets {
-            widgets
-                .into_iter()
-                .for_each(|widget| widget.add_to(&container, tx.clone(), bar_orientation));
+            for widget in widgets {
+                widget.add_to(&container, tx.clone(), bar_orientation, icon_theme);
+            }
        }

        container
@@ -99,7 +116,7 @@ impl Widget {
        let mut builder = Label::builder().use_markup(true);

        if let Some(name) = self.name {
-            builder = builder.name(&name);
+            builder = builder.name(name);
        }

        let label = builder.build();
@@ -119,8 +136,6 @@ impl Widget {
        }

        label
-
-        // DynamicString::new(label, &text)
    }

    /// Creates a `gtk::Button` from this widget
@@ -128,7 +143,7 @@ impl Widget {
        let mut builder = Button::builder();

        if let Some(name) = self.name {
-            builder = builder.name(&name);
+            builder = builder.name(name);
        }

        let button = builder.build();
@@ -146,16 +161,43 @@ impl Widget {

        if let Some(exec) = self.on_click {
            button.connect_clicked(move |button| {
-                tx.try_send(ExecEvent {
-                    cmd: exec.clone(),
-                    geometry: Popup::button_pos(button, bar_orientation),
-                })
-                .expect("Failed to send exec message");
+                try_send!(
+                    tx,
+                    ExecEvent {
+                        cmd: exec.clone(),
+                        geometry: Popup::button_pos(button, bar_orientation),
+                    }
+                );
            });
        }

        button
    }
+
+    fn into_image(self, icon_theme: &IconTheme) -> gtk::Image {
+        let mut builder = gtk::Image::builder();
+
+        if let Some(name) = self.name {
+            builder = builder.name(&name);
+        }
+
+        let gtk_image = builder.build();
+
+        if let Some(src) = self.src {
+            let size = self.size.unwrap_or(32);
+            if let Err(err) = ImageProvider::parse(&src, icon_theme, size)
+                .and_then(|image| image.load_into_image(gtk_image.clone()))
+            {
+                error!("{err:?}");
+            }
+        }
+
+        if let Some(class) = self.class {
+            gtk_image.style_context().add_class(&class);
+        }
+
+        gtk_image
+    }
 }

 #[derive(Debug)]
@@ -168,6 +210,10 @@ impl Module<gtk::Box> for CustomModule {
    type SendMessage = ();
    type ReceiveMessage = ExecEvent;

+    fn name() -> &'static str {
+        "custom"
+    }
+
    fn spawn_controller(
        &self,
        _info: &ModuleInfo,
@@ -185,17 +231,11 @@ impl Module<gtk::Box> for CustomModule {
                        error!("{err:?}");
                    }
                } else if event.cmd == "popup:toggle" {
-                    tx.send(ModuleUpdateEvent::TogglePopup(event.geometry))
-                        .await
-                        .expect("Failed to send open popup event");
+                    send_async!(tx, ModuleUpdateEvent::TogglePopup(event.geometry));
                } else if event.cmd == "popup:open" {
-                    tx.send(ModuleUpdateEvent::OpenPopup(event.geometry))
-                        .await
-                        .expect("Failed to send open popup event");
+                    send_async!(tx, ModuleUpdateEvent::OpenPopup(event.geometry));
                } else if event.cmd == "popup:close" {
-                    tx.send(ModuleUpdateEvent::ClosePopup)
-                        .await
-                        .expect("Failed to send open popup event");
+                    send_async!(tx, ModuleUpdateEvent::ClosePopup);
                } else {
                    error!("Received invalid command: '{}'", event.cmd);
                }
@@ -218,10 +258,15 @@ impl Module<gtk::Box> for CustomModule {
        }

        self.bar.clone().into_iter().for_each(|widget| {
-            widget.add_to(&container, context.controller_tx.clone(), orientation);
+            widget.add_to(
+                &container,
+                context.controller_tx.clone(),
+                orientation,
+                info.icon_theme,
+            );
        });

-        let popup = self.into_popup(context.controller_tx, context.popup_rx);
+        let popup = self.into_popup(context.controller_tx, context.popup_rx, info);

        Ok(ModuleWidget {
            widget: container,
@@ -233,6 +278,7 @@ impl Module<gtk::Box> for CustomModule {
        self,
        tx: Sender<Self::ReceiveMessage>,
        _rx: glib::Receiver<Self::SendMessage>,
+        info: &ModuleInfo,
    ) -> Option<gtk::Box>
    where
        Self: Sized,
@@ -246,11 +292,18 @@ impl Module<gtk::Box> for CustomModule {
        }

        if let Some(popup) = self.popup {
-            popup
-                .into_iter()
-                .for_each(|widget| widget.add_to(&container, tx.clone(), Orientation::Horizontal));
+            for widget in popup {
+                widget.add_to(
+                    &container,
+                    tx.clone(),
+                    Orientation::Horizontal,
+                    info.icon_theme,
+                );
+            }
        }

+        container.show_all();
+
        Some(container)
    }
 }
--- a/src/modules/focused.rs
+++ b/src/modules/focused.rs
@@ -1,14 +1,16 @@
 use crate::clients::wayland::{self, ToplevelChange};
-use crate::config::CommonConfig;
+use crate::config::{CommonConfig, TruncateMode};
+use crate::image::ImageProvider;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
-use crate::{await_sync, icon};
+use crate::{await_sync, read_lock, send_async};
 use color_eyre::Result;
 use glib::Continue;
 use gtk::prelude::*;
-use gtk::{IconTheme, Image, Label};
+use gtk::Label;
 use serde::Deserialize;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender};
+use tracing::error;

 #[derive(Debug, Deserialize, Clone)]
 pub struct FocusedModule {
@@ -22,11 +24,11 @@ pub struct FocusedModule {
    /// Icon size in pixels.
    #[serde(default = "default_icon_size")]
    icon_size: i32,
-    /// GTK icon theme to use.
-    icon_theme: Option<String>,
+
+    truncate: Option<TruncateMode>,

    #[serde(flatten)]
-    pub common: CommonConfig,
+    pub common: Option<CommonConfig>,
 }

 const fn default_icon_size() -> i32 {
@@ -37,6 +39,10 @@ impl Module<gtk::Box> for FocusedModule {
    type SendMessage = (String, String);
    type ReceiveMessage = ();

+    fn name() -> &'static str {
+        "focused"
+    }
+
    fn spawn_controller(
        &self,
        _info: &ModuleInfo,
@@ -45,16 +51,15 @@ impl Module<gtk::Box> for FocusedModule {
    ) -> Result<()> {
        let focused = await_sync(async {
            let wl = wayland::get_client().await;
-            let toplevels = wl
-                .toplevels
-                .read()
-                .expect("Failed to get read lock on toplevels")
-                .clone();
+            let toplevels = read_lock!(wl.toplevels);

-            toplevels.into_iter().find(|(_, (top, _))| top.active)
+            toplevels
+                .iter()
+                .find(|(_, (top, _))| top.active)
+                .map(|(_, (top, _))| top.clone())
        });

-        if let Some((_, (top, _))) = focused {
+        if let Some(top) = focused {
            tx.try_send(ModuleUpdateEvent::Update((top.title.clone(), top.app_id)))?;
        }

@@ -72,12 +77,10 @@ impl Module<gtk::Box> for FocusedModule {
                };

                if update {
-                    tx.send(ModuleUpdateEvent::Update((
-                        event.toplevel.title,
-                        event.toplevel.app_id,
-                    )))
-                    .await
-                    .expect("Failed to send focus update");
+                    send_async!(
+                        tx,
+                        ModuleUpdateEvent::Update((event.toplevel.title, event.toplevel.app_id))
+                    );
                }
            }
        });
@@ -90,26 +93,29 @@ impl Module<gtk::Box> for FocusedModule {
        context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
        info: &ModuleInfo,
    ) -> Result<ModuleWidget<gtk::Box>> {
-        let icon_theme = IconTheme::new();
-
-        if let Some(theme) = self.icon_theme {
-            icon_theme.set_custom_theme(Some(&theme));
-        }
+        let icon_theme = info.icon_theme;

        let container = gtk::Box::new(info.bar_position.get_orientation(), 5);

-        let icon = Image::builder().name("icon").build();
+        let icon = gtk::Image::builder().name("icon").build();
        let label = Label::builder().name("label").build();

+        if let Some(truncate) = self.truncate {
+            truncate.truncate_label(&label);
+        }
+
        container.add(&icon);
        container.add(&label);

        {
+            let icon_theme = icon_theme.clone();
            context.widget_rx.attach(None, move |(name, id)| {
-                let pixbuf = icon::get_icon(&icon_theme, &id, self.icon_size);
-
                if self.show_icon {
-                    icon.set_pixbuf(pixbuf.as_ref());
+                    if let Err(err) = ImageProvider::parse(&id, &icon_theme, self.icon_size)
+                        .and_then(|image| image.load_into_image(icon.clone()))
+                    {
+                        error!("{err:?}");
+                    }
                }

                if self.show_title {
--- a/src/modules/launcher/item.rs
+++ b/src/modules/launcher/item.rs
@@ -1,15 +1,17 @@
 use super::open_state::OpenState;
 use crate::clients::wayland::ToplevelInfo;
-use crate::icon::get_icon;
+use crate::image::ImageProvider;
 use crate::modules::launcher::{ItemEvent, LauncherUpdate};
 use crate::modules::ModuleUpdateEvent;
 use crate::popup::Popup;
+use crate::{read_lock, try_send};
 use gtk::prelude::*;
-use gtk::{Button, IconTheme, Image, Orientation};
+use gtk::{Button, IconTheme, Orientation};
 use indexmap::IndexMap;
 use std::rc::Rc;
 use std::sync::RwLock;
 use tokio::sync::mpsc::Sender;
+use tracing::error;

 #[derive(Debug, Clone)]
 pub struct Item {
@@ -150,16 +152,24 @@ impl ItemButton {
            button = button.label(&item.name);
        }

-        if show_icons {
-            let icon = get_icon(icon_theme, &item.app_id, 32);
-            if icon.is_some() {
-                let image = Image::from_pixbuf(icon.as_ref());
-                button = button.image(&image).always_show_image(true);
-            }
-        }
-
        let button = button.build();

+        if show_icons {
+            let gtk_image = gtk::Image::new();
+            let image = ImageProvider::parse(&item.app_id.clone(), icon_theme, 32);
+            match image {
+                Ok(image) => {
+                    button.set_image(Some(&gtk_image));
+                    button.set_always_show_image(true);
+
+                    if let Err(err) = image.load_into_image(gtk_image) {
+                        error!("{err:?}");
+                    }
+                }
+                Err(err) => error!("{err:?}"),
+            };
+        }
+
        let style_context = button.style_context();
        style_context.add_class("item");

@@ -177,14 +187,12 @@ impl ItemButton {
            let app_id = item.app_id.clone();
            let tx = controller_tx.clone();
            button.connect_clicked(move |button| {
-                // lazy check :|
+                // lazy check :| TODO: Improve this
                let style_context = button.style_context();
                if style_context.has_class("open") {
-                    tx.try_send(ItemEvent::FocusItem(app_id.clone()))
-                        .expect("Failed to send item focus event");
+                    try_send!(tx, ItemEvent::FocusItem(app_id.clone()));
                } else {
-                    tx.try_send(ItemEvent::OpenItem(app_id.clone()))
-                        .expect("Failed to send item open event");
+                    try_send!(tx, ItemEvent::OpenItem(app_id.clone()));
                }
            });
        }
@@ -199,24 +207,20 @@ impl ItemButton {
            let menu_state = menu_state.clone();

            button.connect_enter_notify_event(move |button, _| {
-                let menu_state = menu_state
-                    .read()
-                    .expect("Failed to get read lock on item menu state");
+                let menu_state = read_lock!(menu_state);

                if menu_state.num_windows > 1 {
-                    tx.try_send(ModuleUpdateEvent::Update(LauncherUpdate::Hover(
-                        app_id.clone(),
-                    )))
-                    .expect("Failed to send item open popup event");
+                    try_send!(
+                        tx,
+                        ModuleUpdateEvent::Update(LauncherUpdate::Hover(app_id.clone(),))
+                    );

-                    tx.try_send(ModuleUpdateEvent::OpenPopup(Popup::button_pos(
-                        button,
-                        orientation,
-                    )))
-                    .expect("Failed to send item open popup event");
+                    try_send!(
+                        tx,
+                        ModuleUpdateEvent::OpenPopup(Popup::button_pos(button, orientation,))
+                    );
                } else {
-                    tx.try_send(ModuleUpdateEvent::ClosePopup)
-                        .expect("Failed to send item close popup event");
+                    try_send!(tx, ModuleUpdateEvent::ClosePopup);
                }

                Inhibit(false)
--- a/src/modules/launcher/mod.rs
+++ b/src/modules/launcher/mod.rs
@@ -5,12 +5,13 @@ use self::item::{Item, ItemButton, Window};
 use self::open_state::OpenState;
 use crate::clients::wayland::{self, ToplevelChange};
 use crate::config::CommonConfig;
-use crate::icon::find_desktop_file;
+use crate::desktop_file::find_desktop_file;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
+use crate::{lock, read_lock, try_send, write_lock};
 use color_eyre::{Help, Report};
 use glib::Continue;
 use gtk::prelude::*;
-use gtk::{Button, IconTheme, Orientation};
+use gtk::{Button, Orientation};
 use indexmap::IndexMap;
 use serde::Deserialize;
 use std::process::{Command, Stdio};
@@ -32,11 +33,8 @@ pub struct LauncherModule {
    #[serde(default = "crate::config::default_true")]
    show_icons: bool,

-    /// Name of the GTK icon theme to use.
-    icon_theme: Option<String>,
-
    #[serde(flatten)]
-    pub common: CommonConfig,
+    pub common: Option<CommonConfig>,
 }

 #[derive(Debug, Clone)]
@@ -78,6 +76,10 @@ impl Module<gtk::Box> for LauncherModule {
    type SendMessage = LauncherUpdate;
    type ReceiveMessage = ItemEvent;

+    fn name() -> &'static str {
+        "launcher"
+    }
+
    fn spawn_controller(
        &self,
        _info: &ModuleInfo,
@@ -106,14 +108,11 @@ impl Module<gtk::Box> for LauncherModule {
            let tx = tx.clone();
            spawn(async move {
                let wl = wayland::get_client().await;
-                let open_windows = wl
-                    .toplevels
-                    .read()
-                    .expect("Failed to get read lock on toplevels");
+                let open_windows = read_lock!(wl.toplevels);

-                let mut items = items.lock().expect("Failed to get lock on items");
-
-                for (_, (window, _)) in open_windows.clone() {
+                let open_windows = open_windows.clone();
+                for (_, (window, _)) in open_windows {
+                    let mut items = lock!(items);
                    let item = items.get_mut(&window.app_id);
                    match item {
                        Some(item) => {
@@ -125,6 +124,7 @@ impl Module<gtk::Box> for LauncherModule {
                    }
                }

+                let items = lock!(items);
                let items = items.iter();
                for (_, item) in items {
                    tx.try_send(ModuleUpdateEvent::Update(LauncherUpdate::AddItem(
@@ -153,12 +153,10 @@ impl Module<gtk::Box> for LauncherModule {
                let window = event.toplevel;
                let app_id = window.app_id.clone();

-                let items = || items.lock().expect("Failed to get lock on items");
-
                match event.change {
                    ToplevelChange::New => {
                        let new_item = {
-                            let mut items = items();
+                            let mut items = lock!(items);
                            let item = items.get_mut(&app_id);
                            match item {
                                None => {
@@ -185,7 +183,7 @@ impl Module<gtk::Box> for LauncherModule {
                    }
                    ToplevelChange::Close => {
                        let remove_item = {
-                            let mut items = items();
+                            let mut items = lock!(items);
                            let item = items.get_mut(&app_id);
                            match item {
                                Some(item) => {
@@ -214,23 +212,19 @@ impl Module<gtk::Box> for LauncherModule {
                        };
                    }
                    ToplevelChange::Focus(focused) => {
-                        let update_title = if focused {
-                            if let Some(item) = items().get_mut(&app_id) {
+                        let mut update_title = false;
+
+                        if focused {
+                            if let Some(item) = lock!(items).get_mut(&app_id) {
                                item.set_window_focused(window.id, true);

                                // might be switching focus between windows of same app
                                if item.windows.len() > 1 {
                                    item.set_window_name(window.id, window.title.clone());
-                                    true
-                                } else {
-                                    false
+                                    update_title = true;
                                }
-                            } else {
-                                false
                            }
-                        } else {
-                            false
-                        };
+                        }

                        send_update(LauncherUpdate::Focus(app_id.clone(), focused)).await?;

@@ -240,7 +234,7 @@ impl Module<gtk::Box> for LauncherModule {
                        }
                    }
                    ToplevelChange::Title(title) => {
-                        if let Some(item) = items().get_mut(&app_id) {
+                        if let Some(item) = lock!(items).get_mut(&app_id) {
                            item.set_window_name(window.id, title.clone());
                        }

@@ -282,30 +276,28 @@ impl Module<gtk::Box> for LauncherModule {
                    );
                } else {
                    let wl = wayland::get_client().await;
-                    let items = items.lock().expect("Failed to get lock on items");
+                    let items = lock!(items);

                    let id = match event {
                        ItemEvent::FocusItem(app_id) => items
                            .get(&app_id)
                            .and_then(|item| item.windows.first().map(|(_, win)| win.id)),
-                        ItemEvent::FocusWindow(id) => Some(id),
+                        ItemEvent::FocusWindow(id) => Some(id), // FIXME: Broken on wlroots-git
                        ItemEvent::OpenItem(_) => unreachable!(),
                    };

                    if let Some(id) = id {
-                        let toplevels = wl
-                            .toplevels
-                            .read()
-                            .expect("Failed to get read lock on toplevels");
+                        let toplevels = read_lock!(wl.toplevels);
                        let seat = wl.seats.first().expect("Failed to get Wayland seat");
                        if let Some((_top, handle)) = toplevels.get(&id) {
                            handle.activate(seat);
                        };
                    }
+
+                    // roundtrip to immediately send activate event
+                    wl.roundtrip();
                }
            }
-
-            Ok::<(), swayipc_async::Error>(())
        });

        Ok(())
@@ -316,15 +308,15 @@ impl Module<gtk::Box> for LauncherModule {
        context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
        info: &ModuleInfo,
    ) -> crate::Result<ModuleWidget<gtk::Box>> {
-        let icon_theme = IconTheme::new();
-        if let Some(ref theme) = self.icon_theme {
-            icon_theme.set_custom_theme(Some(theme));
-        }
+        let icon_theme = info.icon_theme;

        let container = gtk::Box::new(info.bar_position.get_orientation(), 0);

        {
            let container = container.clone();
+            let icon_theme = icon_theme.clone();
+
+            let controller_tx = context.controller_tx.clone();

            let show_names = self.show_names;
            let show_icons = self.show_icons;
@@ -332,7 +324,6 @@ impl Module<gtk::Box> for LauncherModule {

            let mut buttons = IndexMap::<String, ItemButton>::new();

-            let controller_tx2 = context.controller_tx.clone();
            context.widget_rx.attach(None, move |event| {
                match event {
                    LauncherUpdate::AddItem(item) => {
@@ -348,7 +339,7 @@ impl Module<gtk::Box> for LauncherModule {
                                orientation,
                                &icon_theme,
                                &context.tx,
-                                &controller_tx2,
+                                &controller_tx,
                            );

                            container.add(&button.button);
@@ -359,10 +350,7 @@ impl Module<gtk::Box> for LauncherModule {
                        if let Some(button) = buttons.get(&app_id) {
                            button.set_open(true);

-                            let mut menu_state = button
-                                .menu_state
-                                .write()
-                                .expect("Failed to get write lock on item menu state");
+                            let mut menu_state = write_lock!(button.menu_state);
                            menu_state.num_windows += 1;
                        }
                    }
@@ -383,10 +371,7 @@ impl Module<gtk::Box> for LauncherModule {
                    }
                    LauncherUpdate::RemoveWindow(app_id, _) => {
                        if let Some(button) = buttons.get(&app_id) {
-                            let mut menu_state = button
-                                .menu_state
-                                .write()
-                                .expect("Failed to get write lock on item menu state");
+                            let mut menu_state = write_lock!(button.menu_state);
                            menu_state.num_windows -= 1;
                        }
                    }
@@ -413,7 +398,7 @@ impl Module<gtk::Box> for LauncherModule {
            });
        }

-        let popup = self.into_popup(context.controller_tx, context.popup_rx);
+        let popup = self.into_popup(context.controller_tx, context.popup_rx, info);
        Ok(ModuleWidget {
            widget: container,
            popup,
@@ -424,6 +409,7 @@ impl Module<gtk::Box> for LauncherModule {
        self,
        controller_tx: Sender<Self::ReceiveMessage>,
        rx: glib::Receiver<Self::SendMessage>,
+        _info: &ModuleInfo,
    ) -> Option<gtk::Box> {
        const MAX_WIDTH: i32 = 250;

@@ -452,15 +438,14 @@ impl Module<gtk::Box> for LauncherModule {
                            .into_iter()
                            .map(|(_, win)| {
                                let button = Button::builder()
-                                    .label(&clamp(&win.name))
+                                    .label(clamp(&win.name))
                                    .height_request(40)
                                    .build();

                                {
                                    let tx = controller_tx.clone();
                                    button.connect_clicked(move |button| {
-                                        tx.try_send(ItemEvent::FocusWindow(win.id))
-                                            .expect("Failed to send window click event");
+                                        try_send!(tx, ItemEvent::FocusWindow(win.id));

                                        if let Some(win) = button.window() {
                                            win.hide();
@@ -483,14 +468,13 @@ impl Module<gtk::Box> for LauncherModule {
                        if let Some(buttons) = buttons.get_mut(&app_id) {
                            let button = Button::builder()
                                .height_request(40)
-                                .label(&clamp(&win.name))
+                                .label(clamp(&win.name))
                                .build();

                            {
                                let tx = controller_tx.clone();
                                button.connect_clicked(move |button| {
-                                    tx.try_send(ItemEvent::FocusWindow(win.id))
-                                        .expect("Failed to send window click event");
+                                    try_send!(tx, ItemEvent::FocusWindow(win.id));

                                    if let Some(win) = button.window() {
                                        win.hide();
--- a/src/modules/mod.rs
+++ b/src/modules/mod.rs
@@ -1,26 +1,32 @@
+#[cfg(feature = "clipboard")]
+pub mod clipboard;
 /// Displays the current date and time.
 ///
 /// A custom date/time format string can be set in the config.
 ///
 /// Clicking the widget opens a popup containing the current time
 /// with second-level precision and a calendar.
+#[cfg(feature = "clock")]
 pub mod clock;
 pub mod custom;
 pub mod focused;
 pub mod launcher;
-pub mod mpd;
+#[cfg(feature = "music")]
+pub mod music;
 pub mod script;
+#[cfg(feature = "sys_info")]
 pub mod sysinfo;
+#[cfg(feature = "tray")]
 pub mod tray;
+#[cfg(feature = "workspaces")]
 pub mod workspaces;

 use crate::config::BarPosition;
 use crate::popup::ButtonGeometry;
 use color_eyre::Result;
-use derive_builder::Builder;
 use glib::IsA;
 use gtk::gdk::Monitor;
-use gtk::{Application, Widget};
+use gtk::{Application, IconTheme, Widget};
 use tokio::sync::mpsc;

 #[derive(Clone)]
@@ -29,15 +35,13 @@ pub enum ModuleLocation {
    Center,
    Right,
 }
-
-#[derive(Builder)]
 pub struct ModuleInfo<'a> {
    pub app: &'a Application,
    pub location: ModuleLocation,
    pub bar_position: BarPosition,
    pub monitor: &'a Monitor,
    pub output_name: &'a str,
-    pub module_name: &'a str,
+    pub icon_theme: &'a IconTheme,
 }

 #[derive(Debug)]
@@ -73,6 +77,8 @@ where
    type SendMessage;
    type ReceiveMessage;

+    fn name() -> &'static str;
+
    fn spawn_controller(
        &self,
        info: &ModuleInfo,
@@ -90,6 +96,7 @@ where
        self,
        _tx: mpsc::Sender<Self::ReceiveMessage>,
        _rx: glib::Receiver<Self::SendMessage>,
+        _info: &ModuleInfo,
    ) -> Option<gtk::Box>
    where
        Self: Sized,
--- a/src/modules/mpd.rs
+++ b/src/modules/mpd.rs
@@ -1,492 +0,0 @@
-use crate::clients::mpd::{get_client, get_duration, get_elapsed, MpdConnectionError};
-use crate::config::CommonConfig;
-use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
-use crate::popup::Popup;
-use color_eyre::Result;
-use dirs::{audio_dir, home_dir};
-use glib::Continue;
-use gtk::gdk_pixbuf::Pixbuf;
-use gtk::prelude::*;
-use gtk::{Button, Image, Label, Orientation, Scale};
-use mpd_client::commands;
-use mpd_client::responses::{PlayState, Song, Status};
-use mpd_client::tag::Tag;
-use regex::Regex;
-use serde::Deserialize;
-use std::path::PathBuf;
-use tokio::spawn;
-use tokio::sync::mpsc;
-use tokio::sync::mpsc::{Receiver, Sender};
-use tracing::error;
-
-#[derive(Debug)]
-pub enum PlayerCommand {
-    Previous,
-    Toggle,
-    Next,
-    Volume(u8),
-}
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct Icons {
-    /// Icon to display when playing.
-    #[serde(default = "default_icon_play")]
-    play: String,
-    /// Icon to display when paused.
-    #[serde(default = "default_icon_pause")]
-    pause: String,
-    /// Icon to display under volume slider
-    #[serde(default = "default_icon_volume")]
-    volume: String,
-}
-
-impl Default for Icons {
-    fn default() -> Self {
-        Self {
-            pause: default_icon_pause(),
-            play: default_icon_play(),
-            volume: default_icon_volume(),
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct MpdModule {
-    /// TCP or Unix socket address.
-    #[serde(default = "default_socket")]
-    host: String,
-    /// Format of current song info to display on the bar.
-    #[serde(default = "default_format")]
-    format: String,
-
-    /// Player state icons
-    #[serde(default)]
-    icons: Icons,
-
-    /// Path to root of music directory.
-    #[serde(default = "default_music_dir")]
-    music_dir: PathBuf,
-
-    #[serde(flatten)]
-    pub common: CommonConfig,
-}
-
-fn default_socket() -> String {
-    String::from("localhost:6600")
-}
-
-fn default_format() -> String {
-    String::from("{icon}  {title} / {artist}")
-}
-
-fn default_icon_play() -> String {
-    String::from("")
-}
-
-fn default_icon_pause() -> String {
-    String::from("")
-}
-
-fn default_icon_volume() -> String {
-    String::from("墳")
-}
-
-fn default_music_dir() -> PathBuf {
-    audio_dir().unwrap_or_else(|| home_dir().map(|dir| dir.join("Music")).unwrap_or_default())
-}
-
-/// Attempts to read the first value for a tag
-/// (since the MPD client returns a vector of tags, or None)
-pub fn try_get_first_tag(vec: Option<&Vec<String>>) -> Option<&str> {
-    vec.and_then(|vec| vec.first().map(String::as_str))
-}
-
-/// Formats a duration given in seconds
-/// in hh:mm format
-fn format_time(time: u64) -> String {
-    let minutes = (time / 60) % 60;
-    let seconds = time % 60;
-
-    format!("{:0>2}:{:0>2}", minutes, seconds)
-}
-
-/// Extracts the formatting tokens from a formatting string
-fn get_tokens(re: &Regex, format_string: &str) -> Vec<String> {
-    re.captures_iter(format_string)
-        .map(|caps| caps[1].to_string())
-        .collect::<Vec<_>>()
-}
-
-#[derive(Clone, Debug)]
-pub struct SongUpdate {
-    song: Song,
-    status: Status,
-    display_string: String,
-}
-
-impl Module<Button> for MpdModule {
-    type SendMessage = Option<SongUpdate>;
-    type ReceiveMessage = PlayerCommand;
-
-    fn spawn_controller(
-        &self,
-        _info: &ModuleInfo,
-        tx: Sender<ModuleUpdateEvent<Self::SendMessage>>,
-        mut rx: Receiver<Self::ReceiveMessage>,
-    ) -> Result<()> {
-        let host1 = self.host.clone();
-        let host2 = self.host.clone();
-        let format = self.format.clone();
-        let icons = self.icons.clone();
-
-        let re = Regex::new(r"\{([\w-]+)}")?;
-        let tokens = get_tokens(&re, self.format.as_str());
-
-        // poll mpd server
-        spawn(async move {
-            let client = get_client(&host1).await.expect("Failed to connect to MPD");
-            let mut mpd_rx = client.subscribe();
-
-            loop {
-                let current_song = client.command(commands::CurrentSong).await;
-                let status = client.command(commands::Status).await;
-
-                if let (Ok(Some(song)), Ok(status)) = (current_song, status) {
-                    let display_string =
-                        replace_tokens(format.as_str(), &tokens, &song.song, &status, &icons);
-
-                    let update = SongUpdate {
-                        song: song.song,
-                        status,
-                        display_string,
-                    };
-
-                    tx.send(ModuleUpdateEvent::Update(Some(update))).await?;
-                } else {
-                    tx.send(ModuleUpdateEvent::Update(None)).await?;
-                }
-
-                // wait for player state change
-                if mpd_rx.recv().await.is_err() {
-                    break;
-                }
-            }
-
-            Ok::<(), mpsc::error::SendError<ModuleUpdateEvent<Self::SendMessage>>>(())
-        });
-
-        // listen to ui events
-        spawn(async move {
-            let client = get_client(&host2).await?;
-
-            while let Some(event) = rx.recv().await {
-                let res = match event {
-                    PlayerCommand::Previous => client.command(commands::Previous).await,
-                    PlayerCommand::Toggle => match client.command(commands::Status).await {
-                        Ok(status) => match status.state {
-                            PlayState::Playing => client.command(commands::SetPause(true)).await,
-                            PlayState::Paused => client.command(commands::SetPause(false)).await,
-                            PlayState::Stopped => Ok(()),
-                        },
-                        Err(err) => Err(err),
-                    },
-                    PlayerCommand::Next => client.command(commands::Next).await,
-                    PlayerCommand::Volume(vol) => client.command(commands::SetVolume(vol)).await,
-                };
-
-                if let Err(err) = res {
-                    error!("Failed to send command to MPD server: {:?}", err);
-                }
-            }
-
-            Ok::<(), MpdConnectionError>(())
-        });
-
-        Ok(())
-    }
-
-    fn into_widget(
-        self,
-        context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
-        info: &ModuleInfo,
-    ) -> Result<ModuleWidget<Button>> {
-        let button = Button::new();
-        let label = Label::new(None);
-        label.set_angle(info.bar_position.get_angle());
-        button.add(&label);
-
-        let orientation = info.bar_position.get_orientation();
-
-        {
-            let tx = context.tx.clone();
-
-            button.connect_clicked(move |button| {
-                tx.try_send(ModuleUpdateEvent::TogglePopup(Popup::button_pos(
-                    button,
-                    orientation,
-                )))
-                .expect("Failed to send MPD popup open event");
-            });
-        }
-
-        {
-            let button = button.clone();
-            let tx = context.tx.clone();
-
-            context.widget_rx.attach(None, move |mut event| {
-                if let Some(event) = event.take() {
-                    label.set_label(&event.display_string);
-                    button.show();
-                } else {
-                    button.hide();
-                    tx.try_send(ModuleUpdateEvent::ClosePopup)
-                        .expect("Failed to send close popup message");
-                }
-
-                Continue(true)
-            });
-        };
-
-        let popup = self.into_popup(context.controller_tx, context.popup_rx);
-
-        Ok(ModuleWidget {
-            widget: button,
-            popup,
-        })
-    }
-
-    fn into_popup(
-        self,
-        tx: Sender<Self::ReceiveMessage>,
-        rx: glib::Receiver<Self::SendMessage>,
-    ) -> Option<gtk::Box> {
-        let container = gtk::Box::builder()
-            .orientation(Orientation::Horizontal)
-            .spacing(10)
-            .name("popup-mpd")
-            .build();
-
-        let album_image = Image::builder()
-            .width_request(128)
-            .height_request(128)
-            .name("album-art")
-            .build();
-
-        let info_box = gtk::Box::new(Orientation::Vertical, 10);
-        let title_label = IconLabel::new("\u{f886}", None);
-        let album_label = IconLabel::new("\u{f524}", None);
-        let artist_label = IconLabel::new("\u{fd01}", None);
-
-        title_label.container.set_widget_name("title");
-        album_label.container.set_widget_name("album");
-        artist_label.container.set_widget_name("label");
-
-        info_box.add(&title_label.container);
-        info_box.add(&album_label.container);
-        info_box.add(&artist_label.container);
-
-        let controls_box = gtk::Box::builder().name("controls").build();
-        let btn_prev = Button::builder().label("\u{f9ad}").name("btn-prev").build();
-        let btn_play_pause = Button::builder().label("").name("btn-play-pause").build();
-        let btn_next = Button::builder().label("\u{f9ac}").name("btn-next").build();
-
-        controls_box.add(&btn_prev);
-        controls_box.add(&btn_play_pause);
-        controls_box.add(&btn_next);
-
-        info_box.add(&controls_box);
-
-        let volume_box = gtk::Box::builder()
-            .orientation(Orientation::Vertical)
-            .spacing(5)
-            .name("volume")
-            .build();
-
-        let volume_slider = Scale::with_range(Orientation::Vertical, 0.0, 100.0, 5.0);
-        volume_slider.set_inverted(true);
-        volume_slider.set_widget_name("scale");
-
-        let volume_icon = Label::new(Some(&self.icons.volume));
-        volume_icon.style_context().add_class("icon");
-
-        volume_box.pack_start(&volume_slider, true, true, 0);
-        volume_box.pack_end(&volume_icon, false, false, 0);
-
-        container.add(&album_image);
-        container.add(&info_box);
-        container.add(&volume_box);
-
-        let tx_prev = tx.clone();
-        btn_prev.connect_clicked(move |_| {
-            tx_prev
-                .try_send(PlayerCommand::Previous)
-                .expect("Failed to send prev track message");
-        });
-
-        let tx_toggle = tx.clone();
-        btn_play_pause.connect_clicked(move |_| {
-            tx_toggle
-                .try_send(PlayerCommand::Toggle)
-                .expect("Failed to send play/pause track message");
-        });
-
-        let tx_next = tx.clone();
-        btn_next.connect_clicked(move |_| {
-            tx_next
-                .try_send(PlayerCommand::Next)
-                .expect("Failed to send next track message");
-        });
-
-        let tx_vol = tx;
-        volume_slider.connect_change_value(move |_, _, val| {
-            tx_vol
-                .try_send(PlayerCommand::Volume(val as u8))
-                .expect("Failed to send volume message");
-
-            Inhibit(false)
-        });
-
-        container.show_all();
-
-        {
-            let music_dir = self.music_dir;
-
-            rx.attach(None, move |update| {
-                if let Some(update) = update {
-                    let prev_album = album_label.label.text();
-                    let curr_album = update.song.album().unwrap_or_default();
-
-                    // only update art when album changes
-                    if prev_album != curr_album {
-                        let cover_path = music_dir.join(
-                            update
-                                .song
-                                .file_path()
-                                .parent()
-                                .expect("Song path should not be root")
-                                .join("cover.jpg"),
-                        );
-
-                        Pixbuf::from_file_at_scale(cover_path, 128, 128, true).map_or_else(
-                            |_| {
-                                album_image.set_from_pixbuf(None);
-                            },
-                            |pixbuf| {
-                                album_image.set_from_pixbuf(Some(&pixbuf));
-                            },
-                        );
-                    }
-
-                    title_label
-                        .label
-                        .set_text(update.song.title().unwrap_or_default());
-                    album_label.label.set_text(curr_album);
-                    artist_label
-                        .label
-                        .set_text(update.song.artists().first().unwrap_or(&String::new()));
-
-                    match update.status.state {
-                        PlayState::Stopped => {
-                            btn_play_pause.set_sensitive(false);
-                        }
-                        PlayState::Playing => {
-                            btn_play_pause.set_sensitive(true);
-                            btn_play_pause.set_label("");
-                        }
-                        PlayState::Paused => {
-                            btn_play_pause.set_sensitive(true);
-                            btn_play_pause.set_label("");
-                        }
-                    }
-
-                    let enable_prev = match update.status.current_song {
-                        Some((pos, _)) => pos.0 > 0,
-                        None => false,
-                    };
-
-                    let enable_next = match update.status.current_song {
-                        Some((pos, _)) => pos.0 < update.status.playlist_length,
-                        None => false,
-                    };
-
-                    btn_prev.set_sensitive(enable_prev);
-                    btn_next.set_sensitive(enable_next);
-
-                    volume_slider.set_value(update.status.volume as f64);
-                }
-
-                Continue(true)
-            });
-        }
-
-        Some(container)
-    }
-}
-
-/// Replaces each of the formatting tokens in the formatting string
-/// with actual data pulled from MPD
-fn replace_tokens(
-    format_string: &str,
-    tokens: &Vec<String>,
-    song: &Song,
-    status: &Status,
-    icons: &Icons,
-) -> String {
-    let mut compiled_string = format_string.to_string();
-    for token in tokens {
-        let value = get_token_value(song, status, icons, token);
-        compiled_string =
-            compiled_string.replace(format!("{{{}}}", token).as_str(), value.as_str());
-    }
-    compiled_string
-}
-
-/// Converts a string format token value
-/// into its respective MPD value.
-fn get_token_value(song: &Song, status: &Status, icons: &Icons, token: &str) -> String {
-    let s = match token {
-        "icon" => {
-            let icon = match status.state {
-                PlayState::Stopped => None,
-                PlayState::Playing => Some(&icons.play),
-                PlayState::Paused => Some(&icons.pause),
-            };
-            icon.map(String::as_str)
-        }
-        "title" => song.title(),
-        "album" => try_get_first_tag(song.tags.get(&Tag::Album)),
-        "artist" => try_get_first_tag(song.tags.get(&Tag::Artist)),
-        "date" => try_get_first_tag(song.tags.get(&Tag::Date)),
-        "disc" => try_get_first_tag(song.tags.get(&Tag::Disc)),
-        "genre" => try_get_first_tag(song.tags.get(&Tag::Genre)),
-        "track" => try_get_first_tag(song.tags.get(&Tag::Track)),
-        "duration" => return get_duration(status).map(format_time).unwrap_or_default(),
-
-        "elapsed" => return get_elapsed(status).map(format_time).unwrap_or_default(),
-        _ => Some(token),
-    };
-    s.unwrap_or_default().to_string()
-}
-
-#[derive(Clone)]
-struct IconLabel {
-    label: Label,
-    container: gtk::Box,
-}
-
-impl IconLabel {
-    fn new(icon: &str, label: Option<&str>) -> Self {
-        let container = gtk::Box::new(Orientation::Horizontal, 5);
-
-        let icon = Label::new(Some(icon));
-        let label = Label::new(label);
-
-        icon.style_context().add_class("icon");
-        label.style_context().add_class("label");
-
-        container.add(&icon);
-        container.add(&label);
-
-        Self { label, container }
-    }
-}
--- a/src/modules/music/config.rs
+++ b/src/modules/music/config.rs
@@ -0,0 +1,140 @@
+use crate::config::{CommonConfig, TruncateMode};
+use dirs::{audio_dir, home_dir};
+use serde::Deserialize;
+use std::path::PathBuf;
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Icons {
+    /// Icon to display when playing.
+    #[serde(default = "default_icon_play")]
+    pub(crate) play: String,
+
+    /// Icon to display when paused.
+    #[serde(default = "default_icon_pause")]
+    pub(crate) pause: String,
+
+    /// Icon to display for previous button.
+    #[serde(default = "default_icon_prev")]
+    pub(crate) prev: String,
+
+    /// Icon to display for next button.
+    #[serde(default = "default_icon_next")]
+    pub(crate) next: String,
+
+    /// Icon to display under volume slider
+    #[serde(default = "default_icon_volume")]
+    pub(crate) volume: String,
+
+    /// Icon to display nex to track title
+    #[serde(default = "default_icon_track")]
+    pub(crate) track: String,
+
+    /// Icon to display nex to album name
+    #[serde(default = "default_icon_album")]
+    pub(crate) album: String,
+
+    /// Icon to display nex to artist name
+    #[serde(default = "default_icon_artist")]
+    pub(crate) artist: String,
+}
+
+impl Default for Icons {
+    fn default() -> Self {
+        Self {
+            pause: default_icon_pause(),
+            play: default_icon_play(),
+            prev: default_icon_prev(),
+            next: default_icon_next(),
+            volume: default_icon_volume(),
+            track: default_icon_track(),
+            album: default_icon_album(),
+            artist: default_icon_artist(),
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Clone, Copy)]
+#[serde(rename_all = "snake_case")]
+pub enum PlayerType {
+    Mpd,
+    Mpris,
+}
+
+impl Default for PlayerType {
+    fn default() -> Self {
+        Self::Mpris
+    }
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct MusicModule {
+    /// Type of player to connect to
+    #[serde(default)]
+    pub(crate) player_type: PlayerType,
+
+    /// Format of current song info to display on the bar.
+    #[serde(default = "default_format")]
+    pub(crate) format: String,
+
+    /// Player state icons
+    #[serde(default)]
+    pub(crate) icons: Icons,
+
+    // -- MPD --
+    /// TCP or Unix socket address.
+    #[serde(default = "default_socket")]
+    pub(crate) host: String,
+    /// Path to root of music directory.
+    #[serde(default = "default_music_dir")]
+    pub(crate) music_dir: PathBuf,
+
+    // -- Common --
+    pub(crate) truncate: Option<TruncateMode>,
+
+    #[serde(flatten)]
+    pub common: Option<CommonConfig>,
+}
+
+fn default_socket() -> String {
+    String::from("localhost:6600")
+}
+
+fn default_format() -> String {
+    String::from("{title} / {artist}")
+}
+
+fn default_icon_play() -> String {
+    String::from("")
+}
+
+fn default_icon_pause() -> String {
+    String::from("")
+}
+
+fn default_icon_prev() -> String {
+    String::from("\u{f9ad}")
+}
+
+fn default_icon_next() -> String {
+    String::from("\u{f9ac}")
+}
+
+fn default_icon_volume() -> String {
+    String::from("墳")
+}
+
+fn default_icon_track() -> String {
+    String::from("\u{f886}")
+}
+
+fn default_icon_album() -> String {
+    String::from("\u{f524}")
+}
+
+fn default_icon_artist() -> String {
+    String::from("\u{fd01}")
+}
+
+fn default_music_dir() -> PathBuf {
+    audio_dir().unwrap_or_else(|| home_dir().map(|dir| dir.join("Music")).unwrap_or_default())
+}
--- a/src/modules/music/mod.rs
+++ b/src/modules/music/mod.rs
@@ -0,0 +1,465 @@
+mod config;
+
+use crate::clients::music::{self, MusicClient, PlayerState, PlayerUpdate, Status, Track};
+use crate::image::{new_icon_button, new_icon_label, ImageProvider};
+use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
+use crate::popup::Popup;
+use crate::{send_async, try_send};
+use color_eyre::Result;
+use glib::Continue;
+use gtk::prelude::*;
+use gtk::{Button, IconTheme, Label, Orientation, Scale};
+use regex::Regex;
+use std::path::PathBuf;
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::spawn;
+use tokio::sync::mpsc::{Receiver, Sender};
+use tracing::error;
+
+pub use self::config::MusicModule;
+use self::config::PlayerType;
+
+#[derive(Debug)]
+pub enum PlayerCommand {
+    Previous,
+    Play,
+    Pause,
+    Next,
+    Volume(u8),
+}
+
+/// Formats a duration given in seconds
+/// in hh:mm format
+fn format_time(duration: Duration) -> String {
+    let time = duration.as_secs();
+    let minutes = (time / 60) % 60;
+    let seconds = time % 60;
+
+    format!("{minutes:0>2}:{seconds:0>2}")
+}
+
+/// Extracts the formatting tokens from a formatting string
+fn get_tokens(re: &Regex, format_string: &str) -> Vec<String> {
+    re.captures_iter(format_string)
+        .map(|caps| caps[1].to_string())
+        .collect::<Vec<_>>()
+}
+
+#[derive(Clone, Debug)]
+pub struct SongUpdate {
+    song: Track,
+    status: Status,
+    display_string: String,
+}
+
+async fn get_client(
+    player_type: PlayerType,
+    host: &str,
+    music_dir: PathBuf,
+) -> Box<Arc<dyn MusicClient>> {
+    match player_type {
+        PlayerType::Mpd => music::get_client(music::ClientType::Mpd { host, music_dir }),
+        PlayerType::Mpris => music::get_client(music::ClientType::Mpris {}),
+    }
+    .await
+}
+
+impl Module<Button> for MusicModule {
+    type SendMessage = Option<SongUpdate>;
+    type ReceiveMessage = PlayerCommand;
+
+    fn name() -> &'static str {
+        "music"
+    }
+
+    fn spawn_controller(
+        &self,
+        _info: &ModuleInfo,
+        tx: Sender<ModuleUpdateEvent<Self::SendMessage>>,
+        mut rx: Receiver<Self::ReceiveMessage>,
+    ) -> Result<()> {
+        let format = self.format.clone();
+
+        let re = Regex::new(r"\{([\w-]+)}")?;
+        let tokens = get_tokens(&re, self.format.as_str());
+
+        // receive player updates
+        {
+            let player_type = self.player_type;
+            let host = self.host.clone();
+            let music_dir = self.music_dir.clone();
+
+            spawn(async move {
+                loop {
+                    let mut rx = {
+                        let client = get_client(player_type, &host, music_dir.clone()).await;
+                        client.subscribe_change()
+                    };
+
+                    while let Ok(update) = rx.recv().await {
+                        match update {
+                            PlayerUpdate::Update(track, status) => match *track {
+                                Some(track) => {
+                                    let display_string =
+                                        replace_tokens(format.as_str(), &tokens, &track, &status);
+
+                                    let update = SongUpdate {
+                                        song: track,
+                                        status,
+                                        display_string,
+                                    };
+
+                                    send_async!(tx, ModuleUpdateEvent::Update(Some(update)));
+                                }
+                                None => send_async!(tx, ModuleUpdateEvent::Update(None)),
+                            },
+                            PlayerUpdate::Disconnect => break,
+                        }
+                    }
+                }
+            });
+        }
+
+        // listen to ui events
+        {
+            let player_type = self.player_type;
+            let host = self.host.clone();
+            let music_dir = self.music_dir.clone();
+
+            spawn(async move {
+                while let Some(event) = rx.recv().await {
+                    let client = get_client(player_type, &host, music_dir.clone()).await;
+                    let res = match event {
+                        PlayerCommand::Previous => client.prev(),
+                        PlayerCommand::Play => client.play(),
+                        PlayerCommand::Pause => client.pause(),
+                        PlayerCommand::Next => client.next(),
+                        PlayerCommand::Volume(vol) => client.set_volume_percent(vol), // .unwrap_or_else(|_| error!("Failed to update player volume")),
+                    };
+
+                    if let Err(err) = res {
+                        error!("Failed to send command to server: {:?}", err);
+                    }
+                }
+            });
+        }
+
+        Ok(())
+    }
+
+    fn into_widget(
+        self,
+        context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
+        info: &ModuleInfo,
+    ) -> Result<ModuleWidget<Button>> {
+        let button = Button::new();
+        let button_contents = gtk::Box::new(Orientation::Horizontal, 5);
+        button.add(&button_contents);
+
+        let icon_play = new_icon_label(&self.icons.play, info.icon_theme, 24);
+        let icon_pause = new_icon_label(&self.icons.pause, info.icon_theme, 24);
+        let label = Label::new(None);
+
+        label.set_angle(info.bar_position.get_angle());
+
+        if let Some(truncate) = self.truncate {
+            truncate.truncate_label(&label);
+        }
+
+        button_contents.add(&icon_pause);
+        button_contents.add(&icon_play);
+        button_contents.add(&label);
+
+        let orientation = info.bar_position.get_orientation();
+
+        {
+            let tx = context.tx.clone();
+
+            button.connect_clicked(move |button| {
+                try_send!(
+                    tx,
+                    ModuleUpdateEvent::TogglePopup(Popup::button_pos(button, orientation,))
+                );
+            });
+        }
+
+        {
+            let button = button.clone();
+            let tx = context.tx.clone();
+
+            context.widget_rx.attach(None, move |mut event| {
+                if let Some(event) = event.take() {
+                    label.set_label(&event.display_string);
+
+                    match event.status.state {
+                        PlayerState::Playing => {
+                            icon_play.show();
+                            icon_pause.hide();
+                        }
+                        PlayerState::Paused => {
+                            icon_pause.show();
+                            icon_play.hide();
+                        }
+                        PlayerState::Stopped => {
+                            button.hide();
+                        }
+                    }
+
+                    button.show();
+                } else {
+                    button.hide();
+                    try_send!(tx, ModuleUpdateEvent::ClosePopup);
+                }
+
+                Continue(true)
+            });
+        };
+
+        let popup = self.into_popup(context.controller_tx, context.popup_rx, info);
+
+        Ok(ModuleWidget {
+            widget: button,
+            popup,
+        })
+    }
+
+    fn into_popup(
+        self,
+        tx: Sender<Self::ReceiveMessage>,
+        rx: glib::Receiver<Self::SendMessage>,
+        info: &ModuleInfo,
+    ) -> Option<gtk::Box> {
+        let icon_theme = info.icon_theme;
+
+        let container = gtk::Box::builder()
+            .orientation(Orientation::Horizontal)
+            .spacing(10)
+            .name("popup-music")
+            .build();
+
+        let album_image = gtk::Image::builder()
+            .width_request(128)
+            .height_request(128)
+            .name("album-art")
+            .build();
+
+        let icons = self.icons;
+
+        let info_box = gtk::Box::new(Orientation::Vertical, 10);
+        let title_label = IconLabel::new(&icons.track, None, icon_theme);
+        let album_label = IconLabel::new(&icons.album, None, icon_theme);
+        let artist_label = IconLabel::new(&icons.artist, None, icon_theme);
+
+        title_label.container.set_widget_name("title");
+        album_label.container.set_widget_name("album");
+        artist_label.container.set_widget_name("artist");
+
+        info_box.add(&title_label.container);
+        info_box.add(&album_label.container);
+        info_box.add(&artist_label.container);
+
+        let controls_box = gtk::Box::builder().name("controls").build();
+
+        let btn_prev = new_icon_button(&icons.prev, icon_theme, 24);
+        btn_prev.set_widget_name("btn-prev");
+
+        let btn_play = new_icon_button(&icons.play, icon_theme, 24);
+        btn_play.set_widget_name("btn-play");
+
+        let btn_pause = new_icon_button(&icons.pause, icon_theme, 24);
+        btn_pause.set_widget_name("btn-pause");
+
+        let btn_next = new_icon_button(&icons.next, icon_theme, 24);
+        btn_next.set_widget_name("btn-next");
+
+        controls_box.add(&btn_prev);
+        controls_box.add(&btn_play);
+        controls_box.add(&btn_pause);
+        controls_box.add(&btn_next);
+
+        info_box.add(&controls_box);
+
+        let volume_box = gtk::Box::builder()
+            .orientation(Orientation::Vertical)
+            .spacing(5)
+            .name("volume")
+            .build();
+
+        let volume_slider = Scale::with_range(Orientation::Vertical, 0.0, 100.0, 5.0);
+        volume_slider.set_inverted(true);
+        volume_slider.set_widget_name("slider");
+
+        let volume_icon = new_icon_label(&icons.volume, icon_theme, 24);
+        volume_icon.style_context().add_class("icon");
+
+        volume_box.pack_start(&volume_slider, true, true, 0);
+        volume_box.pack_end(&volume_icon, false, false, 0);
+
+        container.add(&album_image);
+        container.add(&info_box);
+        container.add(&volume_box);
+
+        let tx_prev = tx.clone();
+        btn_prev.connect_clicked(move |_| {
+            try_send!(tx_prev, PlayerCommand::Previous);
+        });
+
+        let tx_play = tx.clone();
+        btn_play.connect_clicked(move |_| {
+            try_send!(tx_play, PlayerCommand::Play);
+        });
+
+        let tx_pause = tx.clone();
+        btn_pause.connect_clicked(move |_| {
+            try_send!(tx_pause, PlayerCommand::Pause);
+        });
+
+        let tx_next = tx.clone();
+        btn_next.connect_clicked(move |_| {
+            try_send!(tx_next, PlayerCommand::Next);
+        });
+
+        let tx_vol = tx;
+        volume_slider.connect_change_value(move |_, _, val| {
+            try_send!(tx_vol, PlayerCommand::Volume(val as u8));
+            Inhibit(false)
+        });
+
+        container.show_all();
+
+        {
+            let icon_theme = icon_theme.clone();
+
+            let mut prev_cover = None;
+            rx.attach(None, move |update| {
+                if let Some(update) = update {
+                    // only update art when album changes
+                    let new_cover = update.song.cover_path;
+                    if prev_cover != new_cover {
+                        prev_cover = new_cover.clone();
+                        let res = match new_cover
+                            .map(|cover_path| ImageProvider::parse(&cover_path, &icon_theme, 128))
+                        {
+                            Some(Ok(image)) => image.load_into_image(album_image.clone()),
+                            Some(Err(err)) => {
+                                album_image.set_from_pixbuf(None);
+                                Err(err)
+                            }
+                            None => {
+                                album_image.set_from_pixbuf(None);
+                                Ok(())
+                            }
+                        };
+                        if let Err(err) = res {
+                            error!("{err:?}");
+                        }
+                    }
+
+                    title_label
+                        .label
+                        .set_text(&update.song.title.unwrap_or_default());
+                    album_label
+                        .label
+                        .set_text(&update.song.album.unwrap_or_default());
+                    artist_label
+                        .label
+                        .set_text(&update.song.artist.unwrap_or_default());
+
+                    match update.status.state {
+                        PlayerState::Stopped => {
+                            btn_pause.hide();
+                            btn_play.show();
+                            btn_play.set_sensitive(false);
+                        }
+                        PlayerState::Playing => {
+                            btn_play.set_sensitive(false);
+                            btn_play.hide();
+
+                            btn_pause.set_sensitive(true);
+                            btn_pause.show();
+                        }
+                        PlayerState::Paused => {
+                            btn_pause.set_sensitive(false);
+                            btn_pause.hide();
+
+                            btn_play.set_sensitive(true);
+                            btn_play.show();
+                        }
+                    }
+
+                    let enable_prev = update.status.playlist_position > 0;
+
+                    let enable_next =
+                        update.status.playlist_position < update.status.playlist_length;
+
+                    btn_prev.set_sensitive(enable_prev);
+                    btn_next.set_sensitive(enable_next);
+
+                    volume_slider.set_value(update.status.volume_percent as f64);
+                }
+
+                Continue(true)
+            });
+        }
+
+        Some(container)
+    }
+}
+
+/// Replaces each of the formatting tokens in the formatting string
+/// with actual data pulled from the music player
+fn replace_tokens(
+    format_string: &str,
+    tokens: &Vec<String>,
+    song: &Track,
+    status: &Status,
+) -> String {
+    let mut compiled_string = format_string.to_string();
+    for token in tokens {
+        let value = get_token_value(song, status, token);
+        compiled_string = compiled_string.replace(format!("{{{token}}}").as_str(), value.as_str());
+    }
+    compiled_string
+}
+
+/// Converts a string format token value
+/// into its respective value.
+fn get_token_value(song: &Track, status: &Status, token: &str) -> String {
+    match token {
+        "title" => song.title.clone(),
+        "album" => song.album.clone(),
+        "artist" => song.artist.clone(),
+        "date" => song.date.clone(),
+        "disc" => song.disc.map(|x| x.to_string()),
+        "genre" => song.genre.clone(),
+        "track" => song.track.map(|x| x.to_string()),
+        "duration" => status.duration.map(format_time),
+        "elapsed" => status.elapsed.map(format_time),
+        _ => Some(token.to_string()),
+    }
+    .unwrap_or_default()
+}
+
+#[derive(Clone, Debug)]
+struct IconLabel {
+    label: Label,
+    container: gtk::Box,
+}
+
+impl IconLabel {
+    fn new(icon_input: &str, label: Option<&str>, icon_theme: &IconTheme) -> Self {
+        let container = gtk::Box::new(Orientation::Horizontal, 5);
+
+        let icon = new_icon_label(icon_input, icon_theme, 32);
+        let label = Label::new(label);
+
+        icon.style_context().add_class("icon");
+        label.style_context().add_class("label");
+
+        container.add(&icon);
+        container.add(&label);
+
+        Self { label, container }
+    }
+}
--- a/src/modules/script.rs
+++ b/src/modules/script.rs
@@ -1,6 +1,7 @@
 use crate::config::CommonConfig;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::script::{OutputStream, Script, ScriptMode};
+use crate::try_send;
 use color_eyre::{Help, Report, Result};
 use gtk::prelude::*;
 use gtk::Label;
@@ -21,7 +22,7 @@ pub struct ScriptModule {
    interval: u64,

    #[serde(flatten)]
-    pub common: CommonConfig,
+    pub common: Option<CommonConfig>,
 }

 /// `Mode::Poll`
@@ -48,6 +49,10 @@ impl Module<Label> for ScriptModule {
    type SendMessage = String;
    type ReceiveMessage = ();

+    fn name() -> &'static str {
+        "script"
+    }
+
    fn spawn_controller(
        &self,
        _info: &ModuleInfo,
@@ -59,8 +64,8 @@ impl Module<Label> for ScriptModule {
        spawn(async move {
            script.run(move |(out, _)| match out {
               OutputStream::Stdout(stdout) => {
-                   tx.try_send(ModuleUpdateEvent::Update(stdout))
-                       .expect("Failed to send stdout"); }
+                   try_send!(tx, ModuleUpdateEvent::Update(stdout));
+               },
               OutputStream::Stderr(stderr) => {
                   error!("{:?}", Report::msg(stderr)
                                    .wrap_err("Watched script error:")
--- a/src/modules/sysinfo.rs
+++ b/src/modules/sysinfo.rs
@@ -1,5 +1,6 @@
 use crate::config::CommonConfig;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
+use crate::send_async;
 use color_eyre::Result;
 use gtk::prelude::*;
 use gtk::Label;
@@ -22,7 +23,7 @@ pub struct SysInfoModule {
    interval: Interval,

    #[serde(flatten)]
-    pub common: CommonConfig,
+    pub common: Option<CommonConfig>,
 }

 #[derive(Debug, Deserialize, Copy, Clone)]
@@ -116,6 +117,10 @@ impl Module<gtk::Box> for SysInfoModule {
    type SendMessage = HashMap<String, String>;
    type ReceiveMessage = ();

+    fn name() -> &'static str {
+        "sysinfo"
+    }
+
    fn spawn_controller(
        &self,
        _info: &ModuleInfo,
@@ -135,83 +140,24 @@ impl Module<gtk::Box> for SysInfoModule {

        let (refresh_tx, mut refresh_rx) = mpsc::channel(16);

-        // memory refresh
-        {
-            let tx = refresh_tx.clone();
-            spawn(async move {
-                loop {
-                    tx.send(RefreshType::Memory)
-                        .await
-                        .expect("Failed to send memory refresh");
-                    sleep(Duration::from_secs(interval.memory())).await;
-                }
-            });
+        macro_rules! spawn_refresh {
+            ($refresh_type:expr, $func:ident) => {{
+                let tx = refresh_tx.clone();
+                spawn(async move {
+                    loop {
+                        send_async!(tx, $refresh_type);
+                        sleep(Duration::from_secs(interval.$func())).await;
+                    }
+                });
+            }};
        }

-        // cpu refresh
-        {
-            let tx = refresh_tx.clone();
-            spawn(async move {
-                loop {
-                    tx.send(RefreshType::Cpu)
-                        .await
-                        .expect("Failed to send cpu refresh");
-                    sleep(Duration::from_secs(interval.cpu())).await;
-                }
-            });
-        }
-
-        // temp refresh
-        {
-            let tx = refresh_tx.clone();
-            spawn(async move {
-                loop {
-                    tx.send(RefreshType::Temps)
-                        .await
-                        .expect("Failed to send temperature refresh");
-                    sleep(Duration::from_secs(interval.temps())).await;
-                }
-            });
-        }
-
-        // disk refresh
-        {
-            let tx = refresh_tx.clone();
-            spawn(async move {
-                loop {
-                    tx.send(RefreshType::Disks)
-                        .await
-                        .expect("Failed to send disk refresh");
-                    sleep(Duration::from_secs(interval.disks())).await;
-                }
-            });
-        }
-
-        // network refresh
-        {
-            let tx = refresh_tx.clone();
-            spawn(async move {
-                loop {
-                    tx.send(RefreshType::Network)
-                        .await
-                        .expect("Failed to send network refresh");
-                    sleep(Duration::from_secs(interval.networks())).await;
-                }
-            });
-        }
-
-        // system refresh
-        {
-            let tx = refresh_tx;
-            spawn(async move {
-                loop {
-                    tx.send(RefreshType::System)
-                        .await
-                        .expect("Failed to send system refresh");
-                    sleep(Duration::from_secs(interval.system())).await;
-                }
-            });
-        }
+        spawn_refresh!(RefreshType::Memory, memory);
+        spawn_refresh!(RefreshType::Cpu, cpu);
+        spawn_refresh!(RefreshType::Temps, temps);
+        spawn_refresh!(RefreshType::Disks, disks);
+        spawn_refresh!(RefreshType::Network, networks);
+        spawn_refresh!(RefreshType::System, system);

        spawn(async move {
            let mut format_info = HashMap::new();
@@ -228,9 +174,7 @@ impl Module<gtk::Box> for SysInfoModule {
                    RefreshType::System => refresh_system_tokens(&mut format_info, &sys),
                };

-                tx.send(ModuleUpdateEvent::Update(format_info.clone()))
-                    .await
-                    .expect("Failed to send system info map");
+                send_async!(tx, ModuleUpdateEvent::Update(format_info.clone()));
            }
        });

@@ -306,7 +250,7 @@ fn refresh_memory_tokens(format_info: &mut HashMap<String, String>, sys: &mut Sy
    );
    format_info.insert(
        String::from("memory_percent"),
-        format!("{:0>2.0}", memory_percent),
+        format!("{memory_percent:0>2.0}"),
    );

    let used_swap = sys.used_swap();
@@ -336,10 +280,7 @@ fn refresh_cpu_tokens(format_info: &mut HashMap<String, String>, sys: &mut Syste
    let cpu_info = sys.global_cpu_info();
    let cpu_percent = cpu_info.cpu_usage();

-    format_info.insert(
-        String::from("cpu_percent"),
-        format!("{:0>2.0}", cpu_percent),
-    );
+    format_info.insert(String::from("cpu_percent"), format!("{cpu_percent:0>2.0}"));
 }

 fn refresh_temp_tokens(format_info: &mut HashMap<String, String>, sys: &mut System) {
@@ -420,16 +361,19 @@ fn refresh_system_tokens(format_info: &mut HashMap<String, String>, sys: &System
    // no refresh required for these tokens

    let load_average = sys.load_average();
-    format_info.insert(String::from("load_average:1"), load_average.one.to_string());
+    format_info.insert(
+        String::from("load_average:1"),
+        format!("{:.2}", load_average.one),
+    );

    format_info.insert(
        String::from("load_average:5"),
-        load_average.five.to_string(),
+        format!("{:.2}", load_average.five),
    );

    format_info.insert(
        String::from("load_average:15"),
-        load_average.fifteen.to_string(),
+        format!("{:.2}", load_average.fifteen),
    );

    let uptime = Duration::from_secs(sys.uptime()).as_secs();
--- a/src/modules/tray.rs
+++ b/src/modules/tray.rs
@@ -1,7 +1,7 @@
-use crate::await_sync;
 use crate::clients::system_tray::get_tray_event_client;
 use crate::config::CommonConfig;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
+use crate::{await_sync, try_send};
 use color_eyre::Result;
 use gtk::prelude::*;
 use gtk::{IconLookupFlags, IconTheme, Image, Menu, MenuBar, MenuItem, SeparatorMenuItem};
@@ -17,7 +17,7 @@ use tokio::sync::mpsc::{Receiver, Sender};
 #[derive(Debug, Deserialize, Clone)]
 pub struct TrayModule {
    #[serde(flatten)]
-    pub common: CommonConfig,
+    pub common: Option<CommonConfig>,
 }

 /// Gets a GTK `Image` component
@@ -70,12 +70,14 @@ fn get_menu_items(
                    {
                        let tx = tx.clone();
                        item.connect_activate(move |_item| {
-                            tx.try_send(NotifierItemCommand::MenuItemClicked {
-                                submenu_id: info.id,
-                                menu_path: path.clone(),
-                                notifier_address: id.clone(),
-                            })
-                            .expect("Failed to send menu item clicked event");
+                            try_send!(
+                                tx,
+                                NotifierItemCommand::MenuItemClicked {
+                                    submenu_id: info.id,
+                                    menu_path: path.clone(),
+                                    notifier_address: id.clone(),
+                                }
+                            );
                        });
                    }

@@ -92,6 +94,10 @@ impl Module<MenuBar> for TrayModule {
    type SendMessage = NotifierItemMessage;
    type ReceiveMessage = NotifierItemCommand;

+    fn name() -> &'static str {
+        "tray"
+    }
+
    fn spawn_controller(
        &self,
        _info: &ModuleInfo,
--- a/src/modules/workspaces.rs
+++ b/src/modules/workspaces.rs
@@ -1,17 +1,34 @@
-use crate::await_sync;
-use crate::clients::sway::{get_client, get_sub_client};
+use crate::clients::compositor::{Compositor, WorkspaceUpdate};
 use crate::config::CommonConfig;
+use crate::image::new_icon_button;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
+use crate::{send_async, try_send};
 use color_eyre::{Report, Result};
 use gtk::prelude::*;
-use gtk::Button;
+use gtk::{Button, IconTheme};
 use serde::Deserialize;
+use std::cmp::Ordering;
 use std::collections::HashMap;
-use swayipc_async::{Workspace, WorkspaceChange, WorkspaceEvent};
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender};
 use tracing::trace;

+#[derive(Debug, Deserialize, Clone, Copy, Eq, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub enum SortOrder {
+    /// Shows workspaces in the order they're added
+    Added,
+    /// Shows workspaces in numeric order.
+    /// Named workspaces are added to the end in alphabetical order.
+    Alphanumeric,
+}
+
+impl Default for SortOrder {
+    fn default() -> Self {
+        Self::Alphanumeric
+    }
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct WorkspacesModule {
    /// Map of actual workspace names to custom names.
@@ -21,14 +38,11 @@ pub struct WorkspacesModule {
    #[serde(default = "crate::config::default_false")]
    all_monitors: bool,

-    #[serde(flatten)]
-    pub common: CommonConfig,
-}
+    #[serde(default)]
+    sort: SortOrder,

-#[derive(Clone, Debug)]
-pub enum WorkspaceUpdate {
-    Init(Vec<Workspace>),
-    Update(Box<WorkspaceEvent>),
+    #[serde(flatten)]
+    pub common: Option<CommonConfig>,
 }

 /// Creates a button from a workspace
@@ -36,11 +50,13 @@ fn create_button(
    name: &str,
    focused: bool,
    name_map: &HashMap<String, String>,
+    icon_theme: &IconTheme,
    tx: &Sender<String>,
 ) -> Button {
-    let button = Button::builder()
-        .label(name_map.get(name).map_or(name, String::as_str))
-        .build();
+    let label = name_map.get(name).map_or(name, String::as_str);
+
+    let button = new_icon_button(label, icon_theme, 32);
+    button.set_widget_name(name);

    let style_context = button.style_context();
    style_context.add_class("item");
@@ -53,69 +69,71 @@ fn create_button(
        let tx = tx.clone();
        let name = name.to_string();
        button.connect_clicked(move |_item| {
-            tx.try_send(name.clone())
-                .expect("Failed to send workspace click event");
+            try_send!(tx, name.clone());
        });
    }

    button
 }

+fn reorder_workspaces(container: &gtk::Box) {
+    let mut buttons = container
+        .children()
+        .into_iter()
+        .map(|child| (child.widget_name().to_string(), child))
+        .collect::<Vec<_>>();
+
+    buttons.sort_by(|(label_a, _), (label_b, _a)| {
+        match (label_a.parse::<i32>(), label_b.parse::<i32>()) {
+            (Ok(a), Ok(b)) => a.cmp(&b),
+            (Ok(_), Err(_)) => Ordering::Less,
+            (Err(_), Ok(_)) => Ordering::Greater,
+            (Err(_), Err(_)) => label_a.cmp(label_b),
+        }
+    });
+
+    for (i, (_, button)) in buttons.into_iter().enumerate() {
+        container.reorder_child(&button, i as i32);
+    }
+}
+
 impl Module<gtk::Box> for WorkspacesModule {
    type SendMessage = WorkspaceUpdate;
    type ReceiveMessage = String;

+    fn name() -> &'static str {
+        "workspaces"
+    }
+
    fn spawn_controller(
        &self,
-        info: &ModuleInfo,
+        _info: &ModuleInfo,
        tx: Sender<ModuleUpdateEvent<Self::SendMessage>>,
        mut rx: Receiver<Self::ReceiveMessage>,
    ) -> Result<()> {
-        let workspaces = {
-            trace!("Getting current workspaces");
-            let workspaces = await_sync(async {
-                let sway = get_client().await;
-                let mut sway = sway.lock().await;
-                sway.get_workspaces().await
-            })?;
-
-            if self.all_monitors {
-                workspaces
-            } else {
-                trace!("Filtering workspaces to current monitor only");
-                workspaces
-                    .into_iter()
-                    .filter(|workspace| workspace.output == info.output_name)
-                    .collect()
-            }
-        };
-
-        tx.try_send(ModuleUpdateEvent::Update(WorkspaceUpdate::Init(workspaces)))
-            .expect("Failed to send initial workspace list");
-
        // Subscribe & send events
        spawn(async move {
            let mut srx = {
-                let sway = get_sub_client();
-                sway.subscribe_workspace()
+                let client =
+                    Compositor::get_workspace_client().expect("Failed to get workspace client");
+                client.subscribe_workspace_change()
            };

            trace!("Set up Sway workspace subscription");

            while let Ok(payload) = srx.recv().await {
-                tx.send(ModuleUpdateEvent::Update(WorkspaceUpdate::Update(payload)))
-                    .await
-                    .expect("Failed to send workspace update");
+                send_async!(tx, ModuleUpdateEvent::Update(payload));
            }
        });

        // Change workspace focus
        spawn(async move {
            trace!("Setting up UI event handler");
-            let sway = get_client().await;
+
            while let Some(name) = rx.recv().await {
-                let mut sway = sway.lock().await;
-                sway.run_command(format!("workspace {}", name)).await?;
+                let client =
+                    Compositor::get_workspace_client().expect("Failed to get workspace client");
+                client.focus(name)?;
            }

            Ok::<(), Report>(())
@@ -138,96 +156,108 @@ impl Module<gtk::Box> for WorkspacesModule {
        {
            let container = container.clone();
            let output_name = info.output_name.to_string();
+            let icon_theme = info.icon_theme.clone();
+
+            // keep track of whether init event has fired previously
+            // since it fires for every workspace subscriber
+            let mut has_initialized = false;

            context.widget_rx.attach(None, move |event| {
                match event {
                    WorkspaceUpdate::Init(workspaces) => {
-                        trace!("Creating workspace buttons");
-                        for workspace in workspaces {
-                            let item = create_button(
-                                &workspace.name,
-                                workspace.focused,
-                                &name_map,
-                                &context.controller_tx,
-                            );
-                            container.add(&item);
-                            button_map.insert(workspace.name, item);
+                        if !has_initialized {
+                            trace!("Creating workspace buttons");
+                            for workspace in workspaces {
+                                if self.all_monitors || workspace.monitor == output_name {
+                                    let item = create_button(
+                                        &workspace.name,
+                                        workspace.focused,
+                                        &name_map,
+                                        &icon_theme,
+                                        &context.controller_tx,
+                                    );
+                                    container.add(&item);
+
+                                    button_map.insert(workspace.name, item);
+                                }
+                            }
+
+                            if self.sort == SortOrder::Alphanumeric {
+                                reorder_workspaces(&container);
+                            }
+
+                            container.show_all();
+                            has_initialized = true;
                        }
-                        container.show_all();
                    }
-                    WorkspaceUpdate::Update(event) if event.change == WorkspaceChange::Focus => {
-                        let old = event
-                            .old
-                            .and_then(|old| old.name)
-                            .and_then(|name| button_map.get(&name));
+                    WorkspaceUpdate::Focus { old, new } => {
+                        let old = button_map.get(&old);
                        if let Some(old) = old {
                            old.style_context().remove_class("focused");
                        }

-                        let new = event
-                            .current
-                            .and_then(|old| old.name)
-                            .and_then(|new| button_map.get(&new));
+                        let new = button_map.get(&new);
                        if let Some(new) = new {
                            new.style_context().add_class("focused");
                        }
                    }
-                    WorkspaceUpdate::Update(event) if event.change == WorkspaceChange::Init => {
-                        if let Some(workspace) = event.current {
-                            if self.all_monitors
-                                || workspace.output.unwrap_or_default() == output_name
-                            {
-                                let name = workspace.name.unwrap_or_default();
+                    WorkspaceUpdate::Add(workspace) => {
+                        if self.all_monitors || workspace.monitor == output_name {
+                            let name = workspace.name;
+                            let item = create_button(
+                                &name,
+                                workspace.focused,
+                                &name_map,
+                                &icon_theme,
+                                &context.controller_tx,
+                            );
+
+                            container.add(&item);
+                            if self.sort == SortOrder::Alphanumeric {
+                                reorder_workspaces(&container);
+                            }
+
+                            item.show();
+
+                            if !name.is_empty() {
+                                button_map.insert(name, item);
+                            }
+                        }
+                    }
+                    WorkspaceUpdate::Move(workspace) => {
+                        if !self.all_monitors {
+                            if workspace.monitor == output_name {
+                                let name = workspace.name;
                                let item = create_button(
                                    &name,
                                    workspace.focused,
                                    &name_map,
+                                    &icon_theme,
                                    &context.controller_tx,
                                );

-                                item.show();
                                container.add(&item);

+                                if self.sort == SortOrder::Alphanumeric {
+                                    reorder_workspaces(&container);
+                                }
+
+                                item.show();
+
                                if !name.is_empty() {
                                    button_map.insert(name, item);
                                }
-                            }
-                        }
-                    }
-                    WorkspaceUpdate::Update(event) if event.change == WorkspaceChange::Move => {
-                        if let Some(workspace) = event.current {
-                            if !self.all_monitors {
-                                if workspace.output.unwrap_or_default() == output_name {
-                                    let name = workspace.name.unwrap_or_default();
-                                    let item = create_button(
-                                        &name,
-                                        workspace.focused,
-                                        &name_map,
-                                        &context.controller_tx,
-                                    );
-
-                                    item.show();
-                                    container.add(&item);
-
-                                    if !name.is_empty() {
-                                        button_map.insert(name, item);
-                                    }
-                                } else if let Some(item) =
-                                    button_map.get(&workspace.name.unwrap_or_default())
-                                {
-                                    container.remove(item);
-                                }
-                            }
-                        }
-                    }
-                    WorkspaceUpdate::Update(event) if event.change == WorkspaceChange::Empty => {
-                        if let Some(workspace) = event.current {
-                            if let Some(item) = button_map.get(&workspace.name.unwrap_or_default())
-                            {
+                            } else if let Some(item) = button_map.get(&workspace.name) {
                                container.remove(item);
                            }
                        }
                    }
+                    WorkspaceUpdate::Remove(workspace) => {
+                        let button = button_map.get(&workspace);
+                        if let Some(item) = button {
+                            container.remove(item);
+                        }
+                    }
                    WorkspaceUpdate::Update(_) => {}
                };

--- a/src/popup.rs
+++ b/src/popup.rs
@@ -29,6 +29,7 @@ impl Popup {

        gtk_layer_shell::init_for_window(&win);
        gtk_layer_shell::set_layer(&win, gtk_layer_shell::Layer::Overlay);
+        gtk_layer_shell::set_namespace(&win, env!("CARGO_PKG_NAME"));

        gtk_layer_shell::set_margin(
            &win,
@@ -133,7 +134,7 @@ impl Popup {

    /// Shows the popup
    pub fn show(&self, geometry: ButtonGeometry) {
-        self.window.show_all();
+        self.window.show();
        self.set_pos(geometry);
    }

--- a/src/script.rs
+++ b/src/script.rs
@@ -1,3 +1,4 @@
+use crate::send_async;
 use color_eyre::eyre::WrapErr;
 use color_eyre::{Report, Result};
 use serde::Deserialize;
@@ -37,7 +38,7 @@ impl From<&str> for ScriptMode {
            "watch" | "w" => Self::Watch,
            _ => {
                warn!("Invalid script mode: '{str}', falling back to polling");
-                ScriptMode::Poll
+                Self::Poll
            }
        }
    }
@@ -55,8 +56,8 @@ impl Display for ScriptMode {
            f,
            "{}",
            match self {
-                ScriptMode::Poll => "poll",
-                ScriptMode::Watch => "watch",
+                Self::Poll => "poll",
+                Self::Watch => "watch",
            }
        )
    }
@@ -129,12 +130,12 @@ impl From<&str> for Script {
                        .iter()
                        .take_while(|c| c.is_ascii_digit())
                        .collect::<String>();
-                    (
-                        ScriptInputToken::Interval(
-                            interval_str.parse::<u64>().expect("Invalid interval"),
-                        ),
-                        interval_str.len(),
-                    )
+
+                    let interval = interval_str.parse::<u64>().unwrap_or_else(|_| {
+                        warn!("Received invalid interval in script string. Falling back to default `5000ms`.");
+                        5000
+                    });
+                    (ScriptInputToken::Interval(interval), interval_str.len())
                }
                // watching or polling
                'w' | 'p' => {
@@ -262,10 +263,10 @@ impl Script {
                select! {
                    _ = handle.wait() => break,
                    Ok(Some(line)) = stdout_lines.next_line() => {
-                        tx.send(OutputStream::Stdout(line)).await.expect("Failed to send stdout");
+                        send_async!(tx, OutputStream::Stdout(line));
                    }
                    Ok(Some(line)) = stderr_lines.next_line() => {
-                        tx.send(OutputStream::Stderr(line)).await.expect("Failed to send stderr");
+                        send_async!(tx, OutputStream::Stderr(line));
                    }
                }
            }
--- a/src/style.rs
+++ b/src/style.rs
@@ -1,3 +1,4 @@
+use crate::send;
 use color_eyre::{Help, Report};
 use glib::Continue;
 use gtk::prelude::CssProviderExt;
@@ -37,8 +38,7 @@ pub fn load_css(style_path: PathBuf) {
            Ok(event) if event.kind == EventKind::Modify(ModifyKind::Data(DataChange::Any)) => {
                debug!("{event:?}");
                if let Some(path) = event.paths.first() {
-                    tx.send(path.clone())
-                        .expect("Failed to send style changed message");
+                    send!(tx, path.clone());
                }
            }
            Err(e) => error!("Error occurred when watching stylesheet: {:?}", e),
Author	SHA1	Message	Date
Jake Stanger	dd7a761484	[wip] volume	2023-04-01 13:07:47 +01:00
Jake Stanger	72ba17add3	Merge pull request #92 from JakeStanger/update_flake_lock_action Update flake.lock	2023-04-01 11:14:03 +01:00
github-actions[bot]	2b07620847	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/7f5639fa3b68054ca0b062866dc62b22c3f11505' (2023-02-26) → 'github:nixos/nixpkgs/e3652e0735fbec227f342712f180f4f21f0594f2' (2023-03-30) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/c1df023b1aaded1b65a1f4ad604a98a58ab4db97' (2023-02-28) → 'github:oxalica/rust-overlay/aa480d799023141e1b9e5d6108700de63d9ad002' (2023-03-31)	2023-04-01 00:57:22 +00:00
Jake Stanger	ba488ad38f	Merge pull request #89 from yavko/fix-hm-module Fix home manager module, and features	2023-03-29 12:51:55 +01:00
yavko	d0b7bdbafc	fix(nix): home manager module, and features	2023-03-29 01:45:40 -07:00
Jake Stanger	0f5ec1fe34	Merge pull request #85 from JakeStanger/refactor/config Use `universal-config` crate for config	2023-03-19 16:37:20 +00:00
Jake Stanger	6221f7454a	refactor: fix new clippy warnings	2023-03-19 16:22:40 +00:00
Jake Stanger	ecdd71a43d	refactor(config): use `universal-config` crate. XML config is not supported.	2023-03-19 16:22:40 +00:00
Jake Stanger	01a36a9476	build: update gtk deps	2023-03-19 00:14:59 +00:00
Jake Stanger	d4dd8c41ea	chore: improve image provider logging	2023-03-04 23:13:35 +00:00
Jake Stanger	83c5dceaa7	chore: clean up println calls	2023-03-04 23:13:22 +00:00
Jake Stanger	711644e190	Merge pull request #81 from JakeStanger/fix/dynamic-string-ordering Fix dynamic string ordering	2023-03-01 23:20:41 +00:00
Jake Stanger	8cbb73b75e	fix(dynamic string): dynamic sections not respecting ordering Fixes #69.	2023-03-01 23:09:34 +00:00
Jake Stanger	7212bbcf61	refactor(dynamic string): use vec instead of indexmap	2023-03-01 23:09:01 +00:00
Jake Stanger	0125ce5916	docs(examples): update styles example	2023-03-01 20:35:41 +00:00
Jake Stanger	2b26eaf410	docs(clipboard): fix incorrect setting description	2023-03-01 20:35:31 +00:00
Jake Stanger	33676fc4dc	ci(nix): fix cachix error	2023-03-01 20:35:12 +00:00
Jake Stanger	7978c48d5c	Merge pull request #79 from JakeStanger/update_flake_lock_action Update flake.lock	2023-03-01 12:55:52 +00:00
Jake Stanger	1d37e010c8	Merge pull request #66 from yavko/add-nix-flags Add initial nix flags impl	2023-03-01 12:55:25 +00:00
yavko	54b9b28c75	fix: make readme more concise	2023-02-28 19:11:18 -08:00
yavko	3a44d74cf3	style(nix): fmt flake.nix	2023-02-28 19:08:43 -08:00
yavko	b1475a1aff	feat(nix): use cargo default features	2023-02-28 19:07:12 -08:00
yavko	b2749fee92	style(nix): fmt flake.nix	2023-02-28 19:07:03 -08:00
yavko	9984b638b5	feat(nix): initial nix feature flags impl	2023-02-28 19:06:53 -08:00
github-actions[bot]	207b60db7e	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2caf4ef5005ecc68141ecb4aac271079f7371c44' (2023-01-30) → 'github:nixos/nixpkgs/7f5639fa3b68054ca0b062866dc62b22c3f11505' (2023-02-26) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/48b1403150c3f5a9aeee8bc4c77c8926f29c6501' (2023-01-31) → 'github:oxalica/rust-overlay/c1df023b1aaded1b65a1f4ad604a98a58ab4db97' (2023-02-28)	2023-03-01 01:09:08 +00:00
Jake Stanger	7779c33e0c	Merge pull request #77 from JakeStanger/feat/clipboard-manager Clipboard manager module	2023-02-28 17:54:06 +00:00
Jake Stanger	575d6cc30f	feat: new clipboard manager module	2023-02-26 13:42:53 +00:00
Jake Stanger	5bbe64bb86	docs(clock): format table	2023-02-25 14:29:38 +00:00
Jake Stanger	83a49165c4	docs(compiling): add info about build deps	2023-02-25 14:29:38 +00:00
Jake Stanger	d84139a914	refactor: general tidy up fix clippy warnings from latest stable rust	2023-02-25 14:26:02 +00:00
Jake Stanger	ca4fe422f2	feat(truncate): ability to set fixed length BREAKING CHANGE: This changes the behaviour of `truncate.length`. A new property, `truncate.max_length`, has been introduced that uses the old behaviour.	2023-02-25 14:26:02 +00:00
Jake Stanger	1ad1961396	Merge pull request #67 from ttoino/feature/margin Add configurable margins around bar	2023-02-08 19:42:15 +00:00
toino	d253c4bd7f	feat: add configurable margins around bar	2023-02-08 18:47:21 +00:00
Jake Stanger	fbee6e8bd4	style: run fmt	2023-02-08 17:30:09 +00:00
Jake Stanger	7c36f5cb0c	docs: fix a couple of issues	2023-02-02 20:37:16 +00:00
Jake Stanger	7dff3e6f8b	fix(image): widgets missing names	2023-02-02 20:37:02 +00:00
Jake Stanger	2ac507144b	fix: not setting layer shell namespace	2023-02-02 20:36:31 +00:00
JakeStanger	82875cde68	docs: update CHANGELOG.md for v0.10.0 [skip ci]	2023-02-01 22:22:19 +00:00
Jake Stanger	d40b3b7d80	chore(release): v0.10.0	2023-02-01 22:21:07 +00:00
Jake Stanger	181561fe2a	Merge pull request #64 from JakeStanger/feat/build-flags feat: add feature flags	2023-02-01 22:09:23 +00:00
Jake Stanger	7b23e61e7d	docs(wiki): update screenshots and examples	2023-02-01 22:06:09 +00:00
Jake Stanger	6a39905b43	docs(compiling): add missing full stop	2023-02-01 21:08:03 +00:00
Jake Stanger	2780d98ee0	Merge branch 'master' into feat/build-flags # Conflicts: # src/image/provider.rs	2023-02-01 21:07:36 +00:00
Jake Stanger	51d2c2279f	fix(images): incorrectly resolving non-files	2023-02-01 21:05:58 +00:00
Jake Stanger	c347b6c944	feat: add feature flags Flags allow you to disable certain functionality and compile with only select features to reduce build time. Resolves #54.	2023-02-01 20:45:52 +00:00
Jake Stanger	e83618b1d6	ci: fix not updating system packages	2023-02-01 17:52:46 +00:00
Jake Stanger	90f57d61b9	docs(music): remove irrelevant `icon` format token BREAKING CHANGE: (Missed from #96141d4) The `{icon}` token has been removed from the `music` module due to incompatibility with the new image/icon support. The icon now always displays as a separate widget before the label and should be removed from your formatting string.	2023-02-01 17:52:34 +00:00
Jake Stanger	0b9af6bb26	Merge pull request #63 from JakeStanger/update_flake_lock_action Update flake.lock	2023-02-01 16:02:09 +00:00
github-actions[bot]	11a65d4fbc	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9b97ad7b4330aacda9b2343396eb3df8a853b4fc' (2023-01-25) → 'github:nixos/nixpkgs/2caf4ef5005ecc68141ecb4aac271079f7371c44' (2023-01-30) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/edd082ca16aa055d5504bea39da36b3ee68e4f1d' (2023-01-29) → 'github:oxalica/rust-overlay/48b1403150c3f5a9aeee8bc4c77c8926f29c6501' (2023-01-31)	2023-02-01 01:07:22 +00:00
Jake Stanger	054262365e	Merge pull request #61 from JakeStanger/fix/hyprland-workspaces fix(hyprland): issues with tracking workspaces	2023-01-30 22:38:05 +00:00
Jake Stanger	058c8f4228	fix(hyprland): issues with tracking workspaces	2023-01-30 22:24:00 +00:00
Jake Stanger	d78d851858	Merge pull request #60 from JakeStanger/fix/tray fix(tray): some init issues	2023-01-30 18:49:45 +00:00
Jake Stanger	db72bc09b4	chore(hyprland): add debug logging	2023-01-30 18:49:30 +00:00
Jake Stanger	5fb412572f	fix(tray): some init issues It ain't perfect but it'll do. Resolves #2.	2023-01-30 18:36:42 +00:00
Jake Stanger	400ac00d23	Merge pull request #59 from JakeStanger/feat/better-images Better images	2023-01-30 12:13:10 +00:00
Jake Stanger	80a4b1d177	build(nix): update flake	2023-01-30 11:51:01 +00:00
Jake Stanger	96141d4990	feat(music): support for using images in `name_map`, additional icon options	2023-01-30 11:51:01 +00:00
Jake Stanger	b054c17d14	feat(workspaces): support for using images in `name_map`	2023-01-30 11:51:01 +00:00
Jake Stanger	3cf9be89fd	feat: global icon theme setting BREAKING CHANGE: This removes the `icon_theme` option from `launcher` and `focused`. You will need to set this at the top of your config instead.	2023-01-30 11:51:01 +00:00
Jake Stanger	393800aaa2	feat(custom): image widget	2023-01-30 11:51:01 +00:00
Jake Stanger	5772711192	fix(music): remote mpris album art not showing Fixes #55.	2023-01-30 11:47:56 +00:00
Jake Stanger	15f0857859	refactor: replace icon loading with improved general image loading	2023-01-29 17:46:02 +00:00
Jake Stanger	8ba9826cd9	Merge pull request #58 from JakeStanger/feat/focus-trunc feat(focused): ability to truncate label text	2023-01-28 23:14:08 +00:00
Jake Stanger	07dbf78010	feat(focused): ability to truncate label text	2023-01-28 23:01:44 +00:00
Jake Stanger	97502559b3	refactor(music): split config code into separate file	2023-01-28 22:43:22 +00:00
Jake Stanger	2b0eb6506a	Merge pull request #57 from JakeStanger/feat/music-trunc feat(music): ability to truncate button text	2023-01-28 22:23:55 +00:00
Jake Stanger	012762e102	refactor: swap out some code for existing macros	2023-01-28 22:07:05 +00:00
Jake Stanger	8691824db1	feat(music): ability to truncate button text Adds new `truncate.mode` and `truncate.length` options, and `truncate` shorthand for mode. Resolves #56.	2023-01-28 22:07:05 +00:00
Jake Stanger	ad97550583	build: update deps	2023-01-28 22:06:47 +00:00
JakeStanger	1ed3220733	docs: update CHANGELOG.md for v0.9.0 [skip ci]	2023-01-28 14:50:58 +00:00
Jake Stanger	c906dd40fb	chore(release): v0.9.0	2023-01-28 14:49:53 +00:00
Jake Stanger	eb30105fc2	style: fix 1.67 clippy warnings	2023-01-28 14:40:31 +00:00
Jake Stanger	90cd078973	fix(mpd): stops working if connection lost The client will now attempt to reconnect when a connection loss is detected. Fixes #21.	2023-01-28 14:40:12 +00:00
Jake Stanger	1cdfebf8db	Merge pull request #53 from JakeStanger/feat/hyprland-workspaces feat(workspaces): hyprland support	2023-01-28 00:53:23 +00:00
Jake Stanger	0cefcbd02b	fix(music): wrong widget name on vol slider	2023-01-28 00:51:24 +00:00
Jake Stanger	08cfbbc2ea	fix(music): unable to go to prev with mpris	2023-01-28 00:43:02 +00:00
Jake Stanger	e1f523cf2a	fix(music): popup artist label using wrong name	2023-01-28 00:27:22 +00:00
Jake Stanger	c223892a57	docs(workspaces): update for hyprland/new ordering option	2023-01-27 23:18:59 +00:00
Jake Stanger	9ba28fe7fa	feat(workspaces): better ordering Includes option to revert to previous (lack of) ordering method if preferred.	2023-01-27 23:18:59 +00:00
Jake Stanger	0d7ab54160	refactor: remove redundant clone	2023-01-27 23:18:59 +00:00
Jake Stanger	6e5d0c1e8c	feat(workspaces): hyprland support Resolves #18. The bar will now automatically detect whether running under Sway or Hyprland and use the correct IPC client depending.	2023-01-27 23:18:59 +00:00
Jake Stanger	a79900d842	Merge pull request #52 from JakeStanger/feat/mpris feat: mpris support	2023-01-25 23:20:31 +00:00
Jake Stanger	6d8e647f12	feat: mpris support Resolves #25. Completely refactors the MPD module to be the 'music' module. This now supports both MPD and MPRIS with the same UI for both. BREAKING CHANGE: The `mpd` module has been renamed to `music`. You will need to update the `type` value in your config and add `player_type` to continue using MPD. You will also need to update your styles.	2023-01-25 23:09:49 +00:00
Jake Stanger	1949d07721	chore(github): update issue templates	2023-01-04 17:36:19 +00:00
Jake Stanger	f779520545	Merge pull request #48 from colemickens/master s/pkgs.system/pkgs.hostPlatform.system/g	2023-01-03 21:30:35 +00:00
Cole Mickens	df7c447e9c	s/pkgs.system/pkgs.hostPlatform.system/g	2023-01-02 23:52:06 -08:00
Jake Stanger	90b9d70941	Merge pull request #47 from JakeStanger/update_flake_lock_action Update flake.lock	2023-01-01 12:07:52 +00:00
github-actions[bot]	da806d38c6	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/e76c78d20685a043d23f5f9e0ccd2203997f1fb1' (2022-11-30) → 'github:nixos/nixpkgs/677ed08a50931e38382dbef01cba08a8f7eac8f6' (2022-12-29) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/bfdf688742cf984c4837dbbe1c6cbca550365613' (2022-12-01) → 'github:oxalica/rust-overlay/176b6fd3dd3d7cea8d22ab1131364a050228d94c' (2022-12-31)	2023-01-01 01:06:03 +00:00
Jake Stanger	8076412bfc	Merge pull request #46 from JakeStanger/feat/mouse-events feat: mouse event config options	2022-12-15 22:10:40 +00:00
Jake Stanger	fa67d077b1	feat: mouse event config options Adds `on_click_middle`, `on_click_right`, `on_scroll_up`, `on_scroll_down`. BREAKING CHANGE: `on_click` is now called `on_click_left` for consistency with new options. Resolves #44.	2022-12-15 21:37:08 +00:00
Jake Stanger	b2afe78c07	Merge pull request #45 from JakeStanger/feat/config-loading-improvements Feat/config loading improvements	2022-12-13 18:47:07 +00:00
Jake Stanger	1dd5863431	feat: better surface some config error messages Resolves #39	2022-12-12 23:28:49 +00:00
Jake Stanger	0a341f6673	build: update libcorn	2022-12-12 23:15:57 +00:00
Jake Stanger	bb81f8e583	Merge pull request #43 from JakeStanger/refactor/general General refactoring and tidy-up	2022-12-12 19:56:34 +00:00
Jake Stanger	a45ebfc1f5	build: update dependencies	2022-12-11 23:30:42 +00:00
Jake Stanger	ea2c84d1bd	refactor: general code tidy-up	2022-12-11 23:17:15 +00:00
Jake Stanger	5e21cbcca6	refactor: macros to reduce repeated code	2022-12-11 22:45:52 +00:00
Jake Stanger	9d5049dde0	refactor: standardise error messages	2022-12-11 21:31:45 +00:00
Jake Stanger	fd2d7e5c7a	refactor: move startup logging code to logging module	2022-12-11 21:31:23 +00:00
Jake Stanger	2c1b2924d4	refactor: move most of the horrible `add_module` macro content into proper functions	2022-12-04 23:23:22 +00:00
Jake Stanger	490f3f3f65	Merge pull request #40 from JakeStanger/update_flake_lock_action Update flake.lock	2022-12-01 20:58:30 +00:00
github-actions[bot]	843e40ef45	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/af50806f7c6ab40df3e6b239099e8f8385f6c78b' (2022-11-21) → 'github:nixos/nixpkgs/e76c78d20685a043d23f5f9e0ccd2203997f1fb1' (2022-11-30) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/9652ef34c7439eca9f86cee11e94dbef5c9adb09' (2022-11-22) → 'github:oxalica/rust-overlay/bfdf688742cf984c4837dbbe1c6cbca550365613' (2022-12-01)	2022-12-01 20:57:34 +00:00
Jake Stanger	d8c60d9d47	ci(nix flake lock): fix invalid action version whoops	2022-12-01 20:56:41 +00:00
JakeStanger	b97f018e81	docs: update CHANGELOG.md for v0.8.0 [skip ci]	2022-11-30 23:01:46 +00:00