2023-12-21 10:22:59 +01:00
192 changed files with 1912 additions and 6288 deletions
--- a/.envrc.sample
+++ b/.envrc.sample
@ -1 +0,0 @@
-use flake
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@ -9,7 +9,7 @@ jobs:
    # https://github.com/actions/virtual-environments/issues/4060 - for lack of VirtualBox on MacOS 11 runners
    runs-on: macos-12
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Test in FreeBSD VM
      uses: vmactions/freebsd-vm@v0
      with:
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@ -6,7 +6,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - uses: DoozyX/clang-format-lint-action@v0.13
      with:
        source: '.'
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -13,20 +13,16 @@ jobs:
          - fedora
          - opensuse
          - gentoo
-        cpp_std: [c++20]
-        include:
-          - distro: fedora
-            cpp_std: c++20

    runs-on: ubuntu-latest
    container:
      image: alexays/waybar:${{ matrix.distro }}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: configure
-        run: meson -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
+        run: meson -Dman-pages=enabled build
      - name: build
        run: ninja -C build
      - name: test
-        run: make test
+        run: meson test -C build --no-rebuild --print-errorlogs --suite waybar
--- a/.gitignore
+++ b/.gitignore
@ -43,4 +43,3 @@ packagecache
 *.exe
 *.out
 *.app
-/.direnv/
--- a/Dockerfiles/archlinux
+++ b/Dockerfiles/archlinux
@ -3,5 +3,4 @@
 FROM archlinux:base-devel

 RUN pacman -Syu --noconfirm && \
-    pacman -S --noconfirm git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection libxkbcommon playerctl iniparser fftw && \
-    sed -Ei 's/#(en_(US|GB)\.UTF)/\1/' /etc/locale.gen && locale-gen
+    pacman -S --noconfirm git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection libxkbcommon playerctl
--- a/Dockerfiles/fedora
+++ b/Dockerfiles/fedora
@ -2,33 +2,12 @@

 FROM fedora:latest

-RUN dnf install -y @c-development \
-    git-core glibc-langpack-en meson scdoc \
-    'pkgconfig(catch2)' \
-    'pkgconfig(date)' \
-    'pkgconfig(dbusmenu-gtk3-0.4)' \
-    'pkgconfig(fmt)' \
-    'pkgconfig(gdk-pixbuf-2.0)' \
-    'pkgconfig(gio-unix-2.0)' \
-    'pkgconfig(gtk-layer-shell-0)' \
-    'pkgconfig(gtkmm-3.0)' \
-    'pkgconfig(jack)' \
-    'pkgconfig(jsoncpp)' \
-    'pkgconfig(libevdev)' \
-    'pkgconfig(libinput)' \
-    'pkgconfig(libmpdclient)' \
-    'pkgconfig(libnl-3.0)' \
-    'pkgconfig(libnl-genl-3.0)' \
-    'pkgconfig(libpulse)' \
-    'pkgconfig(libudev)' \
-    'pkgconfig(playerctl)' \
-    'pkgconfig(pugixml)' \
-    'pkgconfig(sigc++-2.0)' \
-    'pkgconfig(spdlog)' \
-    'pkgconfig(upower-glib)' \
-    'pkgconfig(wayland-client)' \
-    'pkgconfig(wayland-cursor)' \
-    'pkgconfig(wayland-protocols)' \
-    'pkgconfig(wireplumber-0.4)' \
-    'pkgconfig(xkbregistry)' && \
+RUN dnf install -y @c-development git-core meson scdoc 'pkgconfig(date)' \
+    'pkgconfig(dbusmenu-gtk3-0.4)' 'pkgconfig(fmt)' 'pkgconfig(gdk-pixbuf-2.0)' \
+    'pkgconfig(gio-unix-2.0)' 'pkgconfig(gtk-layer-shell-0)' 'pkgconfig(gtkmm-3.0)' \
+    'pkgconfig(jsoncpp)' 'pkgconfig(libinput)' 'pkgconfig(libmpdclient)' \
+    'pkgconfig(libnl-3.0)' 'pkgconfig(libnl-genl-3.0)' 'pkgconfig(libpulse)' \
+    'pkgconfig(libudev)' 'pkgconfig(pugixml)' 'pkgconfig(sigc++-2.0)' 'pkgconfig(spdlog)' \
+    'pkgconfig(wayland-client)' 'pkgconfig(wayland-cursor)' 'pkgconfig(wayland-protocols)' 'pkgconfig(xkbregistry)' \
+    'pkgconfig(playerctl)' && \
    dnf clean all -y
--- a/Dockerfiles/gentoo
+++ b/Dockerfiles/gentoo
@ -6,6 +6,6 @@ RUN export FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox -sandbox -usersa
 		emerge --sync && \
 		eselect news read --quiet new 1>/dev/null 2>&1 && \
 		emerge --verbose --update --deep --with-bdeps=y --backtrack=30 --newuse @world && \
-		USE="wayland gtk3 gtk -doc X pulseaudio minimal" emerge dev-vcs/git dev-libs/wayland dev-libs/wayland-protocols =dev-cpp/gtkmm-3.24.6 x11-libs/libxkbcommon \
+		USE="wayland gtk3 gtk -doc X" emerge dev-vcs/git dev-libs/wayland dev-libs/wayland-protocols =dev-cpp/gtkmm-3.24.6 x11-libs/libxkbcommon \
 		x11-libs/gtk+:3 dev-libs/libdbusmenu dev-libs/libnl sys-power/upower media-libs/libpulse dev-libs/libevdev media-libs/libmpdclient \
-		media-sound/sndio gui-libs/gtk-layer-shell app-text/scdoc media-sound/playerctl dev-libs/iniparser sci-libs/fftw
+		media-sound/sndio gui-libs/gtk-layer-shell app-text/scdoc media-sound/playerctl
--- a/4
+++ b/4
@ -19,9 +19,5 @@ run: build
 debug-run: build-debug
 	./build/waybar --log-level debug

-test:
-	meson test -C build --no-rebuild --verbose --suite waybar
-.PHONY: test
-
 clean:
 	rm -rf build
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 # Waybar [![Licence](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE) [![Paypal Donate](https://img.shields.io/badge/Donate-Paypal-2244dd.svg)](https://paypal.me/ARouillard)<br>![Waybar](https://raw.githubusercontent.com/alexays/waybar/master/preview-2.png)

 > Highly customizable Wayland bar for Sway and Wlroots based compositors.<br>
-> Available in Arch [extra](https://www.archlinux.org/packages/extra/x86_64/waybar/) or
+> Available in Arch [community](https://www.archlinux.org/packages/community/x86_64/waybar/) or
 [AUR](https://aur.archlinux.org/packages/waybar-git/), [Gentoo](https://packages.gentoo.org/packages/gui-apps/waybar), [openSUSE](https://build.opensuse.org/package/show/X11:Wayland/waybar), and [Alpine Linux](https://pkgs.alpinelinux.org/packages?name=waybar).<br>
 > *Waybar [examples](https://github.com/Alexays/Waybar/wiki/Examples)*

@ -9,7 +9,6 @@
 - Sway (Workspaces, Binding mode, Focused window name)
 - River (Mapping mode, Tags, Focused window name)
 - Hyprland (Focused window name)
- DWL (Tags) [requires dwl ipc patch](https://github.com/djpohly/dwl/wiki/ipc)
 - Tray [#21](https://github.com/Alexays/Waybar/issues/21)
 - Local time
 - Battery
--- a/default.nix
+++ b/default.nix
@ -1,10 +0,0 @@
-(import
-  (
-    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
-    fetchTarball {
-      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-      sha256 = lock.nodes.flake-compat.locked.narHash;
-    }
-  )
-  { src = ./.; }
-).defaultNix
--- a/flake.lock
+++ b/flake.lock
@ -1,129 +0,0 @@
-{
-  "nodes": {
-    "devshell": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1692523566,
-        "narHash": "sha256-VDJDihK6jNebVw9y3qKCVD6+6QaC/x8kxZzL4MaIPPY=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "d208c58e2f7afef838add5f18a9936b12a71d695",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1677383253,
-        "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1692638711,
-        "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/flake.nix
+++ b/flake.nix
@ -1,89 +0,0 @@
-{
-  description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    devshell.url = "github:numtide/devshell";
-    flake-utils.url = "github:numtide/flake-utils";
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-  };
-
-  outputs = { self, flake-utils, devshell, nixpkgs, flake-compat }:
-    let
-      inherit (nixpkgs) lib;
-      genSystems = lib.genAttrs [
-        "x86_64-linux"
-      ];
-
-      pkgsFor = genSystems (system:
-        import nixpkgs {
-          inherit system;
-        });
-
-      mkDate = longDate: (lib.concatStringsSep "-" [
-        (builtins.substring 0 4 longDate)
-        (builtins.substring 4 2 longDate)
-        (builtins.substring 6 2 longDate)
-      ]);
-    in
-    {
-      overlays.default = final: prev: {
-        waybar = final.callPackage ./nix/default.nix {
-          version = prev.waybar.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
-        };
-      };
-      packages = genSystems
-        (system:
-          (self.overlays.default pkgsFor.${system} pkgsFor.${system})
-          // {
-            default = self.packages.${system}.waybar;
-          });
-    } //
-    flake-utils.lib.eachDefaultSystem (system: {
-      devShell =
-        let pkgs = import nixpkgs {
-          inherit system;
-
-          overlays = [ devshell.overlays.default ];
-        };
-        in
-        pkgs.devshell.mkShell {
-          imports = [ "${pkgs.devshell.extraModulesDir}/language/c.nix" ];
-
-          devshell.packages = with pkgs; [
-            clang-tools
-            gdb
-            # from nativeBuildInputs
-            gnumake
-            meson
-            ninja
-            pkg-config
-            scdoc
-          ] ++ (map lib.getDev [
-            # from buildInputs
-            wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon
-            # optional dependencies
-            gobject-introspection glib playerctl python3.pkgs.pygobject3
-            libevdev libinput libjack2 libmpdclient playerctl libnl
-            libpulseaudio sndio sway libdbusmenu-gtk3 udev upower wireplumber
-
-            # from propagated build inputs?
-            at-spi2-atk atkmm cairo cairomm catch2 fmt_8 fontconfig
-            gdk-pixbuf glibmm gtk3 harfbuzz pango pangomm wayland-protocols
-          ]);
-
-          env = with pkgs; [
-            { name = "CPLUS_INCLUDE_PATH"; prefix = "$DEVSHELL_DIR/include"; }
-            { name = "PKG_CONFIG_PATH"; prefix = "$DEVSHELL_DIR/lib/pkgconfig"; }
-            { name = "PKG_CONFIG_PATH"; prefix = "$DEVSHELL_DIR/share/pkgconfig"; }
-            { name = "PATH"; prefix = "${wayland.bin}/bin"; }
-            { name = "LIBRARY_PATH"; prefix = "${lib.getLib sndio}/lib"; }
-            { name = "LIBRARY_PATH"; prefix = "${lib.getLib zlib}/lib"; }
-            { name = "LIBRARY_PATH"; prefix = "${lib.getLib howard-hinnant-date}/lib"; }
-          ];
-        };
-    });
-}
--- a/include/AAppIconLabel.hpp
+++ b/include/AAppIconLabel.hpp
@ -1,27 +0,0 @@
-#pragma once
-
-#include <gtkmm/box.h>
-#include <gtkmm/image.h>
-
-#include "AIconLabel.hpp"
-
-namespace waybar {
-
-class AAppIconLabel : public AIconLabel {
- public:
-  AAppIconLabel(const Json::Value &config, const std::string &name, const std::string &id,
-                const std::string &format, uint16_t interval = 0, bool ellipsize = false,
-                bool enable_click = false, bool enable_scroll = false);
-  virtual ~AAppIconLabel() = default;
-  auto update() -> void override;
-
- protected:
-  void updateAppIconName(const std::string &app_identifier,
-                         const std::string &alternative_app_identifier);
-  void updateAppIcon();
-  unsigned app_icon_size_{24};
-  bool update_app_icon_{true};
-  std::string app_icon_name_;
-};
-
-}  // namespace waybar
--- a/include/AIconLabel.hpp
+++ b/include/AIconLabel.hpp
@ -13,7 +13,7 @@ class AIconLabel : public ALabel {
             const std::string &format, uint16_t interval = 0, bool ellipsize = false,
             bool enable_click = false, bool enable_scroll = false);
  virtual ~AIconLabel() = default;
-  auto update() -> void override;
+  virtual auto update() -> void;

 protected:
  Gtk::Image image_;
--- a/include/ALabel.hpp
+++ b/include/ALabel.hpp
@ -14,7 +14,7 @@ class ALabel : public AModule {
         uint16_t interval = 0, bool ellipsize = false, bool enable_click = false,
         bool enable_scroll = false);
  virtual ~ALabel() = default;
-  auto update() -> void override;
+  virtual auto update() -> void;
  virtual std::string getIcon(uint16_t, const std::string &alt = "", uint16_t max = 0);
  virtual std::string getIcon(uint16_t, const std::vector<std::string> &alts, uint16_t max = 0);

@ -25,7 +25,7 @@ class ALabel : public AModule {
  bool alt_ = false;
  std::string default_format_;

-  bool handleToggle(GdkEventButton *const &e) override;
+  virtual bool handleToggle(GdkEventButton *const &e);
  virtual std::string getState(uint8_t value, bool lesser = false);
 };

--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@ -11,20 +11,15 @@ namespace waybar {

 class AModule : public IModule {
 public:
+  AModule(const Json::Value &, const std::string &, const std::string &, bool enable_click = false,
+          bool enable_scroll = false);
  virtual ~AModule();
-  auto update() -> void override;
-  virtual auto refresh(int) -> void{};
-  operator Gtk::Widget &() override;
-  auto doAction(const std::string &name) -> void override;
+  virtual auto update() -> void;
+  virtual operator Gtk::Widget &();

  Glib::Dispatcher dp;

 protected:
-  // Don't need to make an object directly
-  // Derived classes are able to use it
-  AModule(const Json::Value &, const std::string &, const std::string &, bool enable_click = false,
-          bool enable_scroll = false);
-
  enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };

  SCROLL_DIR getScrollDir(GdkEventScroll *e);
@ -41,7 +36,6 @@ class AModule : public IModule {
  std::vector<int> pid_;
  gdouble distance_scrolled_y_;
  gdouble distance_scrolled_x_;
-  std::map<std::string, std::string> eventActionMap_;
  static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
      {std::make_pair(1, GdkEventType::GDK_BUTTON_PRESS), "on-click"},
      {std::make_pair(1, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click"},
--- a/include/IModule.hpp
+++ b/include/IModule.hpp
@ -9,7 +9,6 @@ class IModule {
  virtual ~IModule() = default;
  virtual auto update() -> void = 0;
  virtual operator Gtk::Widget&() = 0;
-  virtual auto doAction(const std::string& name) -> void = 0;
 };

 }  // namespace waybar
--- a/include/factory.hpp
+++ b/include/factory.hpp
@ -1,7 +1,7 @@
 #pragma once

 #include <json/json.h>
-#if defined(HAVE_CHRONO_TIMEZONES) || defined(HAVE_LIBDATE)
+#ifdef HAVE_LIBDATE
 #include "modules/clock.hpp"
 #else
 #include "modules/simpleclock.hpp"
@ -18,20 +18,15 @@
 #include "modules/wlr/workspace_manager.hpp"
 #endif
 #ifdef HAVE_RIVER
-#include "modules/river/layout.hpp"
 #include "modules/river/mode.hpp"
 #include "modules/river/tags.hpp"
 #include "modules/river/window.hpp"
 #endif
-#ifdef HAVE_DWL
-#include "modules/dwl/tags.hpp"
-#endif
 #ifdef HAVE_HYPRLAND
 #include "modules/hyprland/backend.hpp"
 #include "modules/hyprland/language.hpp"
 #include "modules/hyprland/submap.hpp"
 #include "modules/hyprland/window.hpp"
-#include "modules/hyprland/workspaces.hpp"
 #endif
 #if defined(__FreeBSD__) || (defined(__linux__) && !defined(NO_FILESYSTEM))
 #include "modules/battery.hpp"
@ -84,9 +79,6 @@
 #ifdef HAVE_LIBWIREPLUMBER
 #include "modules/wireplumber.hpp"
 #endif
-#ifdef HAVE_LIBCAVA
-#include "modules/cava.hpp"
-#endif
 #include "bar.hpp"
 #include "modules/custom.hpp"
 #include "modules/image.hpp"
--- a/include/group.hpp
+++ b/include/group.hpp
@ -12,10 +12,10 @@ namespace waybar {

 class Group : public AModule {
 public:
-  Group(const std::string&, const std::string&, const Json::Value&, bool);
+  Group(const std::string&, const Bar&, const Json::Value&);
  ~Group() = default;
-  auto update() -> void override;
-  operator Gtk::Widget&() override;
+  auto update() -> void;
+  operator Gtk::Widget&();
  Gtk::Box box;
 };

--- a/include/modules/backlight.hpp
+++ b/include/modules/backlight.hpp
@ -6,7 +6,6 @@
 #include <vector>

 #include "ALabel.hpp"
-#include "giomm/dbusproxy.h"
 #include "util/json.hpp"
 #include "util/sleeper_thread.hpp"

@ -40,8 +39,8 @@ class Backlight : public ALabel {

 public:
  Backlight(const std::string &, const Json::Value &);
-  virtual ~Backlight();
-  auto update() -> void override;
+  ~Backlight();
+  auto update() -> void;

 private:
  template <class ForwardIt>
@ -51,8 +50,6 @@ class Backlight : public ALabel {
  template <class ForwardIt, class Inserter>
  static void enumerate_devices(ForwardIt first, ForwardIt last, Inserter inserter, udev *udev);

-  bool handleScroll(GdkEventScroll *e) override;
-
  const std::string preferred_device_;
  static constexpr int EPOLL_MAX_EVENTS = 16;

@ -63,7 +60,5 @@ class Backlight : public ALabel {
  std::vector<BacklightDev> devices_;
  // thread must destruct before shared data
  util::SleeperThread udev_thread_;
-
-  Glib::RefPtr<Gio::DBus::Proxy> login_proxy_;
 };
 }  // namespace waybar::modules
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@ -29,8 +29,8 @@ namespace fs = std::filesystem;
 class Battery : public ALabel {
 public:
  Battery(const std::string&, const Json::Value&);
-  virtual ~Battery();
-  auto update() -> void override;
+  ~Battery();
+  auto update() -> void;

 private:
  static inline const fs::path data_dir_ = "/sys/class/power_supply/";
--- a/include/modules/bluetooth.hpp
+++ b/include/modules/bluetooth.hpp
@ -45,8 +45,8 @@ class Bluetooth : public ALabel {

 public:
  Bluetooth(const std::string&, const Json::Value&);
-  virtual ~Bluetooth() = default;
-  auto update() -> void override;
+  ~Bluetooth() = default;
+  auto update() -> void;

 private:
  static auto onInterfaceAddedOrRemoved(GDBusObjectManager*, GDBusObject*, GDBusInterface*,
@ -59,8 +59,7 @@ class Bluetooth : public ALabel {
  auto getDeviceProperties(GDBusObject*, DeviceInfo&) -> bool;
  auto getControllerProperties(GDBusObject*, ControllerInfo&) -> bool;

-  // Returns std::nullopt if no controller could be found
-  auto findCurController() -> std::optional<ControllerInfo>;
+  auto findCurController(ControllerInfo&) -> bool;
  auto findConnectedDevices(const std::string&, std::vector<DeviceInfo>&) -> void;

 #ifdef WANT_RFKILL
@ -69,7 +68,7 @@ class Bluetooth : public ALabel {
  const std::unique_ptr<GDBusObjectManager, void (*)(GDBusObjectManager*)> manager_;

  std::string state_;
-  std::optional<ControllerInfo> cur_controller_;
+  ControllerInfo cur_controller_;
  std::vector<DeviceInfo> connected_devices_;
  DeviceInfo cur_focussed_device_;
  std::string device_enumerate_;
--- a/include/modules/cava.hpp
+++ b/include/modules/cava.hpp
@ -1,46 +0,0 @@
-#pragma once
-
-#include "ALabel.hpp"
-#include "util/sleeper_thread.hpp"
-
-extern "C" {
-#include <cava/common.h>
-}
-
-namespace waybar::modules {
-using namespace std::literals::chrono_literals;
-
-class Cava final : public ALabel {
- public:
-  Cava(const std::string&, const Json::Value&);
-  virtual ~Cava();
-  auto update() -> void override;
-  auto doAction(const std::string& name) -> void override;
-
- private:
-  util::SleeperThread thread_;
-  util::SleeperThread thread_fetch_input_;
-
-  struct error_s error_ {};          // cava errors
-  struct config_params prm_ {};      // cava parameters
-  struct audio_raw audio_raw_ {};    // cava handled raw audio data(is based on audio_data)
-  struct audio_data audio_data_ {};  // cava audio data
-  struct cava_plan* plan_;           //{new cava_plan{}};
-  // Cava API to read audio source
-  ptr input_source_;
-  // Delay to handle audio source
-  std::chrono::milliseconds frame_time_milsec_{1s};
-  // Text to display
-  std::string text_{""};
-  int rePaint_{1};
-  std::chrono::seconds fetch_input_delay_{4};
-  std::chrono::seconds suspend_silence_delay_{0};
-  bool silence_{false};
-  int sleep_counter_{0};
-  // Cava method
-  void pause_resume();
-  // ModuleActionMap
-  static inline std::map<const std::string, void (waybar::modules::Cava::*const)()> actionMap_{
-      {"mode", &waybar::modules::Cava::pause_resume}};
-};
-}  // namespace waybar::modules
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@ -1,79 +1,47 @@
 #pragma once

+#include <date/tz.h>
+
 #include "ALabel.hpp"
-#include "util/date.hpp"
 #include "util/sleeper_thread.hpp"

-namespace waybar::modules {
+namespace waybar {
+
+struct waybar_time;
+
+namespace modules {

 const std::string kCalendarPlaceholder = "calendar";
 const std::string KTimezonedTimeListPlaceholder = "timezoned_time_list";

-enum class WeeksSide {
-  LEFT,
-  RIGHT,
-  HIDDEN,
-};
-
-enum class CldMode { MONTH, YEAR };
-
-class Clock final : public ALabel {
+class Clock : public ALabel {
 public:
  Clock(const std::string&, const Json::Value&);
-  virtual ~Clock() = default;
-  auto update() -> void override;
-  auto doAction(const std::string& name) -> void override;
+  ~Clock() = default;
+  auto update() -> void;

 private:
  util::SleeperThread thread_;
  std::locale locale_;
  std::vector<const date::time_zone*> time_zones_;
  int current_time_zone_idx_;
+  date::year_month_day calendar_cached_ymd_{date::January / 1 / 0};
+  date::months calendar_shift_{0}, calendar_shift_init_{0};
+  std::string calendar_cached_text_;
  bool is_calendar_in_tooltip_;
  bool is_timezoned_list_in_tooltip_;

+  bool handleScroll(GdkEventScroll* e);
+
+  std::string fmt_str_weeks_;
+  std::string fmt_str_calendar_;
+  int fmt_weeks_left_pad_{0};
+  auto calendar_text(const waybar_time& wtime) -> std::string;
+  auto weekdays_header(const date::weekday& first_dow, std::ostream& os) -> void;
  auto first_day_of_week() -> date::weekday;
  const date::time_zone* current_timezone();
-  auto timezones_text(std::chrono::system_clock::time_point now) -> std::string;
-
-  /*Calendar properties*/
-  WeeksSide cldWPos_{WeeksSide::HIDDEN};
-  /*
-    0 - calendar.format.months
-    1 - calendar.format.weekdays
-    2 - calendar.format.days
-    3 - calendar.format.today
-    4 - calendar.format.weeks
-    5 - tooltip-format
-   */
-  std::map<int, std::string const> fmtMap_;
-  CldMode cldMode_{CldMode::MONTH};
-  uint cldMonCols_{3};    // Count of the month in the row
-  int cldMonColLen_{20};  // Length of the month column
-  int cldWnLen_{3};       // Length of the week number
-  date::year_month_day cldYearShift_;
-  date::year_month cldMonShift_;
-  date::months cldCurrShift_{0};
-  date::months cldShift_{0};
-  std::string cldYearCached_{};
-  std::string cldMonCached_{};
-  date::day cldBaseDay_{0};
-  /*Calendar functions*/
-  auto get_calendar(const date::year_month_day& today, const date::year_month_day& ymd,
-                    const date::time_zone* tz) -> const std::string;
-  /*Clock actions*/
-  void cldModeSwitch();
-  void cldShift_up();
-  void cldShift_down();
-  void tz_up();
-  void tz_down();
-
-  // ModuleActionMap
-  static inline std::map<const std::string, void (waybar::modules::Clock::*const)()> actionMap_{
-      {"mode", &waybar::modules::Clock::cldModeSwitch},
-      {"shift_up", &waybar::modules::Clock::cldShift_up},
-      {"shift_down", &waybar::modules::Clock::cldShift_down},
-      {"tz_up", &waybar::modules::Clock::tz_up},
-      {"tz_down", &waybar::modules::Clock::tz_down}};
+  bool is_timezone_fixed();
+  auto timezones_text(std::chrono::system_clock::time_point* now) -> std::string;
 };
-}  // namespace waybar::modules
+}  // namespace modules
+}  // namespace waybar
--- a/include/modules/cpu.hpp
+++ b/include/modules/cpu.hpp
@ -17,8 +17,8 @@ namespace waybar::modules {
 class Cpu : public ALabel {
 public:
  Cpu(const std::string&, const Json::Value&);
-  virtual ~Cpu() = default;
-  auto update() -> void override;
+  ~Cpu() = default;
+  auto update() -> void;

 private:
  double getCpuLoad();
--- a/include/modules/custom.hpp
+++ b/include/modules/custom.hpp
@ -1,7 +1,6 @@
 #pragma once

 #include <fmt/format.h>
-#include <fmt/args.h>

 #include <csignal>
 #include <string>
@ -16,9 +15,9 @@ namespace waybar::modules {
 class Custom : public ALabel {
 public:
  Custom(const std::string&, const std::string&, const Json::Value&);
-  virtual ~Custom();
-  auto update() -> void override;
-  void refresh(int /*signal*/) override;
+  ~Custom();
+  auto update() -> void;
+  void refresh(int /*signal*/);

 private:
  void delayWorker();
@ -26,8 +25,8 @@ class Custom : public ALabel {
  void parseOutputRaw();
  void parseOutputJson();
  void handleEvent();
-  bool handleScroll(GdkEventScroll* e) override;
-  bool handleToggle(GdkEventButton* const& e) override;
+  bool handleScroll(GdkEventScroll* e);
+  bool handleToggle(GdkEventButton* const& e);

  const std::string name_;
  std::string text_;
@ -35,7 +34,6 @@ class Custom : public ALabel {
  std::string alt_;
  std::string tooltip_;
  std::vector<std::string> class_;
-  fmt::dynamic_format_arg_store<fmt::format_context> fields_;
  int percentage_;
  FILE* fp_;
  int pid_;
--- a/include/modules/disk.hpp
+++ b/include/modules/disk.hpp
@ -14,8 +14,8 @@ namespace waybar::modules {
 class Disk : public ALabel {
 public:
  Disk(const std::string&, const Json::Value&);
-  virtual ~Disk() = default;
-  auto update() -> void override;
+  ~Disk() = default;
+  auto update() -> void;

 private:
  util::SleeperThread thread_;
--- a/include/modules/dwl/tags.hpp
+++ b/include/modules/dwl/tags.hpp
@ -1,34 +0,0 @@
-#pragma once
-
-#include <gtkmm/button.h>
-#include <wayland-client.h>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "dwl-ipc-unstable-v2-client-protocol.h"
-#include "xdg-output-unstable-v1-client-protocol.h"
-
-namespace waybar::modules::dwl {
-
-class Tags : public waybar::AModule {
- public:
-  Tags(const std::string &, const waybar::Bar &, const Json::Value &);
-  virtual ~Tags();
-
-  // Handlers for wayland events
-  void handle_view_tags(uint32_t tag, uint32_t state, uint32_t clients, uint32_t focused);
-
-  void handle_primary_clicked(uint32_t tag);
-  bool handle_button_press(GdkEventButton *event_button, uint32_t tag);
-
-  struct zdwl_ipc_manager_v2 *status_manager_;
-  struct wl_seat *seat_;
-
- private:
-  const waybar::Bar &bar_;
-  Gtk::Box box_;
-  std::vector<Gtk::Button> buttons_;
-  struct zdwl_ipc_output_v2 *output_status_;
-};
-
-} /* namespace waybar::modules::dwl */
--- a/include/modules/gamemode.hpp
+++ b/include/modules/gamemode.hpp
@ -18,8 +18,8 @@ namespace waybar::modules {
 class Gamemode : public AModule {
 public:
  Gamemode(const std::string &, const Json::Value &);
-  virtual ~Gamemode();
-  auto update() -> void override;
+  ~Gamemode();
+  auto update() -> void;

 private:
  const std::string DEFAULT_ICON_NAME = "input-gaming-symbolic";
@ -39,7 +39,7 @@ class Gamemode : public AModule {
                 const Glib::VariantContainerBase &arguments);

  void getData();
-  bool handleToggle(GdkEventButton *const &) override;
+  bool handleToggle(GdkEventButton *const &);

  // Config
  std::string format = DEFAULT_FORMAT;
--- a/include/modules/hyprland/backend.hpp
+++ b/include/modules/hyprland/backend.hpp
@ -6,8 +6,6 @@
 #include <string>
 #include <thread>

-#include "util/json.hpp"
-
 namespace waybar::modules::hyprland {

 class EventHandler {
@ -24,14 +22,12 @@ class IPC {
  void unregisterForIPC(EventHandler*);

  std::string getSocket1Reply(const std::string& rq);
-  Json::Value getSocket1JsonReply(const std::string& rq);

 private:
  void startIPC();
  void parseIPC(const std::string&);

  std::mutex callbackMutex;
-  util::JsonParser parser_;
  std::list<std::pair<std::string, EventHandler*>> callbacks;
 };

--- a/include/modules/hyprland/language.hpp
+++ b/include/modules/hyprland/language.hpp
@ -10,29 +10,20 @@ namespace waybar::modules::hyprland {
 class Language : public waybar::ALabel, public EventHandler {
 public:
  Language(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~Language();
+  ~Language();

-  auto update() -> void override;
+  auto update() -> void;

 private:
-  void onEvent(const std::string&) override;
+  void onEvent(const std::string&);

  void initLanguage();
-
-  struct Layout {
-    std::string full_name;
-    std::string short_name;
-    std::string variant;
-    std::string short_description;
-  };
-
-  auto getLayout(const std::string&) -> Layout;
+  std::string getShortFrom(const std::string&);

  std::mutex mutex_;
  const Bar& bar_;
  util::JsonParser parser_;
-
-  Layout layout_;
+  std::string layoutName_;
 };

 }  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/submap.hpp
+++ b/include/modules/hyprland/submap.hpp
@ -10,12 +10,12 @@ namespace waybar::modules::hyprland {
 class Submap : public waybar::ALabel, public EventHandler {
 public:
  Submap(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~Submap();
+  ~Submap();

-  auto update() -> void override;
+  auto update() -> void;

 private:
-  void onEvent(const std::string&) override;
+  void onEvent(const std::string&);

  std::mutex mutex_;
  const Bar& bar_;
--- a/include/modules/hyprland/window.hpp
+++ b/include/modules/hyprland/window.hpp
@ -1,60 +1,31 @@
 #include <fmt/format.h>

-#include "AAppIconLabel.hpp"
+#include <tuple>
+
+#include "ALabel.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
 #include "util/json.hpp"

 namespace waybar::modules::hyprland {

-class Window : public waybar::AAppIconLabel, public EventHandler {
+class Window : public waybar::ALabel, public EventHandler {
 public:
  Window(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~Window();
+  ~Window();

-  auto update() -> void override;
+  auto update() -> void;

 private:
-  struct Workspace {
-    int id;
-    int windows;
-    std::string last_window;
-    std::string last_window_title;
-
-    static auto parse(const Json::Value&) -> Workspace;
-  };
-
-  struct WindowData {
-    bool floating;
-    int monitor = -1;
-    std::string class_name;
-    std::string initial_class_name;
-    std::string title;
-    std::string initial_title;
-    bool fullscreen;
-    bool grouped;
-
-    static auto parse(const Json::Value&) -> WindowData;
-  };
-
-  auto getActiveWorkspace(const std::string&) -> Workspace;
-  auto getActiveWorkspace() -> Workspace;
-  void onEvent(const std::string&) override;
-  void queryActiveWorkspace();
-  void setClass(const std::string&, bool enable);
+  int getActiveWorkspaceID(std::string);
+  std::string getLastWindowTitle(int);
+  void onEvent(const std::string&);

  bool separate_outputs;
  std::mutex mutex_;
  const Bar& bar_;
  util::JsonParser parser_;
-  WindowData window_data_;
-  Workspace workspace_;
-  std::string solo_class_;
-  std::string last_solo_class_;
-  bool solo_;
-  bool all_floating_;
-  bool swallowing_;
-  bool fullscreen_;
+  std::string lastView;
 };

 }  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@ -1,91 +0,0 @@
-#include <gtkmm/button.h>
-#include <gtkmm/label.h>
-
-#include <memory>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "modules/hyprland/backend.hpp"
-
-namespace waybar::modules::hyprland {
-
-class Workspace {
- public:
-  Workspace(const Json::Value& workspace_data);
-  std::string& select_icon(std::map<std::string, std::string>& icons_map);
-  Gtk::Button& button() { return button_; };
-
-  int id() const { return id_; };
-  std::string name() const { return name_; };
-  std::string output() const { return output_; };
-  bool active() const { return active_; };
-  bool is_special() const { return is_special_; };
-  bool is_persistent() const { return is_persistent_; };
-  bool is_empty() const { return windows_ == 0; };
-  bool is_urgent() const { return is_urgent_; };
-
-  auto handle_clicked(GdkEventButton* bt) -> bool;
-  void set_active(bool value = true) { active_ = value; };
-  void set_persistent(bool value = true) { is_persistent_ = value; };
-  void set_urgent(bool value = true) { is_urgent_ = value; };
-  void set_windows(uint value) { windows_ = value; };
-
-  void update(const std::string& format, const std::string& icon);
-
- private:
-  int id_;
-  std::string name_;
-  std::string output_;
-  uint windows_;
-  bool active_ = false;
-  bool is_special_ = false;
-  bool is_persistent_ = false;
-  bool is_urgent_ = false;
-
-  Gtk::Button button_;
-  Gtk::Box content_;
-  Gtk::Label label_;
-};
-
-class Workspaces : public AModule, public EventHandler {
- public:
-  Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
-  ~Workspaces() override;
-  void update() override;
-  void init();
-
-  auto all_outputs() const -> bool { return all_outputs_; }
-  auto show_special() const -> bool { return show_special_; }
-
-  auto get_bar_output() const -> std::string { return bar_.output->name; }
-
- private:
-  void onEvent(const std::string&) override;
-  void update_window_count();
-  void sort_workspaces();
-  void create_workspace(Json::Value& value);
-  void remove_workspace(std::string name);
-  void set_urgent_workspace(std::string windowaddress);
-
-  bool all_outputs_ = false;
-  bool show_special_ = false;
-
-  void fill_persistent_workspaces();
-  void create_persistent_workspaces();
-  std::vector<std::string> persistent_workspaces_to_create_;
-  bool persistent_created_ = false;
-
-  std::string format_;
-  std::map<std::string, std::string> icons_map_;
-  bool with_icon_;
-  uint64_t monitor_id_;
-  std::string active_workspace_name_;
-  std::vector<std::unique_ptr<Workspace>> workspaces_;
-  std::vector<Json::Value> workspaces_to_create_;
-  std::vector<std::string> workspaces_to_remove_;
-  std::mutex mutex_;
-  const Bar& bar_;
-  Gtk::Box box_;
-};
-
-}  // namespace waybar::modules::hyprland
--- a/include/modules/idle_inhibitor.hpp
+++ b/include/modules/idle_inhibitor.hpp
@ -13,13 +13,13 @@ class IdleInhibitor : public ALabel {

 public:
  IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~IdleInhibitor();
-  auto update() -> void override;
+  ~IdleInhibitor();
+  auto update() -> void;
  static std::list<waybar::AModule*> modules;
  static bool status;

 private:
-  bool handleToggle(GdkEventButton* const& e) override;
+  bool handleToggle(GdkEventButton* const& e);
  void toggleStatus();

  const Bar& bar_;
--- a/include/modules/image.hpp
+++ b/include/modules/image.hpp
@ -7,7 +7,6 @@
 #include <string>

 #include "ALabel.hpp"
-#include "gtkmm/box.h"
 #include "util/command.hpp"
 #include "util/json.hpp"
 #include "util/sleeper_thread.hpp"
@ -16,23 +15,18 @@ namespace waybar::modules {

 class Image : public AModule {
 public:
-  Image(const std::string&, const Json::Value&);
-  virtual ~Image() = default;
-  auto update() -> void override;
-  void refresh(int /*signal*/) override;
+  Image(const std::string&, const std::string&, const Json::Value&);
+  auto update() -> void;
+  void refresh(int /*signal*/);

 private:
  void delayWorker();
  void handleEvent();
-  void parseOutputRaw();

-  Gtk::Box box_;
  Gtk::Image image_;
  std::string path_;
-  std::string tooltip_;
  int size_;
  int interval_;
-  util::command::res output_;

  util::SleeperThread thread_;
 };
--- a/include/modules/inhibitor.hpp
+++ b/include/modules/inhibitor.hpp
@ -12,12 +12,12 @@ namespace waybar::modules {
 class Inhibitor : public ALabel {
 public:
  Inhibitor(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~Inhibitor();
-  auto update() -> void override;
+  ~Inhibitor() override;
+  auto update() -> void;
  auto activated() -> bool;

 private:
-  auto handleToggle(::GdkEventButton* const& e) -> bool override;
+  auto handleToggle(::GdkEventButton* const& e) -> bool;

  const std::unique_ptr<::GDBusConnection, void (*)(::GDBusConnection*)> dbus_;
  const std::string inhibitors_;
--- a/include/modules/jack.hpp
+++ b/include/modules/jack.hpp
@ -14,8 +14,8 @@ namespace waybar::modules {
 class JACK : public ALabel {
 public:
  JACK(const std::string &, const Json::Value &);
-  virtual ~JACK() = default;
-  auto update() -> void override;
+  ~JACK() = default;
+  auto update() -> void;

  int bufSize(jack_nframes_t size);
  int sampleRate(jack_nframes_t rate);
--- a/include/modules/keyboard_state.hpp
+++ b/include/modules/keyboard_state.hpp
@ -3,7 +3,6 @@
 #include <fmt/chrono.h>
 #include <gtkmm/label.h>

-#include <set>
 #include <unordered_map>

 #include "AModule.hpp"
@ -20,8 +19,8 @@ namespace waybar::modules {
 class KeyboardState : public AModule {
 public:
  KeyboardState(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~KeyboardState();
-  auto update() -> void override;
+  ~KeyboardState();
+  auto update() -> void;

 private:
  auto tryAddDevice(const std::string&) -> void;
@ -41,7 +40,6 @@ class KeyboardState : public AModule {

  struct libinput* libinput_;
  std::unordered_map<std::string, struct libinput_device*> libinput_devices_;
-  std::set<int> binding_keys;

  util::SleeperThread libinput_thread_, hotplug_thread_;
 };
--- a/include/modules/memory.hpp
+++ b/include/modules/memory.hpp
@ -13,8 +13,8 @@ namespace waybar::modules {
 class Memory : public ALabel {
 public:
  Memory(const std::string&, const Json::Value&);
-  virtual ~Memory() = default;
-  auto update() -> void override;
+  ~Memory() = default;
+  auto update() -> void;

 private:
  void parseMeminfo();
--- a/include/modules/mpd/mpd.hpp
+++ b/include/modules/mpd/mpd.hpp
@ -37,7 +37,7 @@ class MPD : public ALabel {
 public:
  MPD(const std::string&, const Json::Value&);
  virtual ~MPD() noexcept = default;
-  auto update() -> void override;
+  auto update() -> void;

 private:
  std::string getTag(mpd_tag_type type, unsigned idx = 0) const;
--- a/include/modules/mpris/mpris.hpp
+++ b/include/modules/mpris/mpris.hpp
@ -16,12 +16,12 @@ extern "C" {

 namespace waybar::modules::mpris {

-class Mpris : public ALabel {
+class Mpris : public AModule {
 public:
  Mpris(const std::string&, const Json::Value&);
-  virtual ~Mpris();
-  auto update() -> void override;
-  bool handleToggle(GdkEventButton* const&) override;
+  ~Mpris();
+  auto update() -> void;
+  bool handleToggle(GdkEventButton* const&);

 private:
  static auto onPlayerNameAppeared(PlayerctlPlayerManager*, PlayerctlPlayerName*, gpointer) -> void;
@ -39,40 +39,21 @@ class Mpris : public ALabel {
    std::optional<std::string> artist;
    std::optional<std::string> album;
    std::optional<std::string> title;
-    std::optional<std::string> length;    // as HH:MM:SS
-    std::optional<std::string> position;  // same format
+    std::optional<std::string> length;  // as HH:MM:SS
  };

  auto getPlayerInfo() -> std::optional<PlayerInfo>;
-  auto getIconFromJson(const Json::Value&, const std::string&) -> std::string;
-  auto getArtistStr(const PlayerInfo&, bool) -> std::string;
-  auto getAlbumStr(const PlayerInfo&, bool) -> std::string;
-  auto getTitleStr(const PlayerInfo&, bool) -> std::string;
-  auto getLengthStr(const PlayerInfo&, bool) -> std::string;
-  auto getPositionStr(const PlayerInfo&, bool) -> std::string;
-  auto getDynamicStr(const PlayerInfo&, bool, bool) -> std::string;
+  auto getIcon(const Json::Value&, const std::string&) -> std::string;
+
+  Gtk::Box box_;
+  Gtk::Label label_;

  // config
+  std::string format_;
  std::string format_playing_;
  std::string format_paused_;
  std::string format_stopped_;
-
-  std::string tooltip_;
-  std::string tooltip_playing_;
-  std::string tooltip_paused_;
-  std::string tooltip_stopped_;
-
-  int artist_len_;
-  int album_len_;
-  int title_len_;
-  int dynamic_len_;
-  std::vector<std::string> dynamic_prio_;
-  std::vector<std::string> dynamic_order_;
-  std::string dynamic_separator_;
-  bool truncate_hours_;
-  bool tooltip_len_limits_;
-  std::string ellipsis_;
-
+  std::chrono::seconds interval_;
  std::string player_;
  std::vector<std::string> ignored_players_;

@ -82,7 +63,6 @@ class Mpris : public ALabel {
  std::string lastPlayer;

  util::SleeperThread thread_;
-  std::chrono::time_point<std::chrono::system_clock> last_update_;
 };

 }  // namespace waybar::modules::mpris
--- a/include/modules/network.hpp
+++ b/include/modules/network.hpp
@ -21,8 +21,8 @@ namespace waybar::modules {
 class Network : public ALabel {
 public:
  Network(const std::string&, const Json::Value&);
-  virtual ~Network();
-  auto update() -> void override;
+  ~Network();
+  auto update() -> void;

 private:
  static const uint8_t MAX_RETRY = 5;
@ -62,7 +62,6 @@ class Network : public ALabel {
  bool want_link_dump_;
  bool want_addr_dump_;
  bool dump_in_progress_;
-  bool is_p2p_;

  unsigned long long bandwidth_down_total_;
  unsigned long long bandwidth_up_total_;
@ -78,6 +77,7 @@ class Network : public ALabel {
  int32_t signal_strength_dbm_;
  uint8_t signal_strength_;
  std::string signal_strength_app_;
+  float frequency_;
  uint32_t route_priority;

  util::SleeperThread thread_;
@ -85,7 +85,6 @@ class Network : public ALabel {
 #ifdef WANT_RFKILL
  util::Rfkill rfkill_;
 #endif
-  float frequency_;
 };

 }  // namespace waybar::modules
--- a/include/modules/pulseaudio.hpp
+++ b/include/modules/pulseaudio.hpp
@ -14,8 +14,8 @@ namespace waybar::modules {
 class Pulseaudio : public ALabel {
 public:
  Pulseaudio(const std::string&, const Json::Value&);
-  virtual ~Pulseaudio();
-  auto update() -> void override;
+  ~Pulseaudio();
+  auto update() -> void;

 private:
  static void subscribeCb(pa_context*, pa_subscription_event_type_t, uint32_t, void*);
@ -25,7 +25,7 @@ class Pulseaudio : public ALabel {
  static void serverInfoCb(pa_context*, const pa_server_info*, void*);
  static void volumeModifyCb(pa_context*, int, void*);

-  bool handleScroll(GdkEventScroll* e) override;
+  bool handleScroll(GdkEventScroll* e);
  const std::vector<std::string> getPulseIcon() const;

  pa_threaded_mainloop* mainloop_;
--- a/include/modules/river/layout.hpp
+++ b/include/modules/river/layout.hpp
@ -1,33 +0,0 @@
-#pragma once
-
-#include <wayland-client.h>
-
-#include "ALabel.hpp"
-#include "bar.hpp"
-#include "river-status-unstable-v1-client-protocol.h"
-
-namespace waybar::modules::river {
-
-class Layout : public waybar::ALabel {
- public:
-  Layout(const std::string &, const waybar::Bar &, const Json::Value &);
-  virtual ~Layout();
-
-  // Handlers for wayland events
-  void handle_name(const char *name);
-  void handle_clear();
-  void handle_focused_output(struct wl_output *output);
-  void handle_unfocused_output(struct wl_output *output);
-
-  struct zriver_status_manager_v1 *status_manager_;
-  struct wl_seat *seat_;
-
- private:
-  const waybar::Bar &bar_;
-  struct wl_output *output_;          // stores the output this module belongs to
-  struct wl_output *focused_output_;  // stores the currently focused output
-  struct zriver_output_status_v1 *output_status_;
-  struct zriver_seat_status_v1 *seat_status_;
-};
-
-} /* namespace waybar::modules::river */
--- a/include/modules/river/mode.hpp
+++ b/include/modules/river/mode.hpp
@ -11,7 +11,7 @@ namespace waybar::modules::river {
 class Mode : public waybar::ALabel {
 public:
  Mode(const std::string &, const waybar::Bar &, const Json::Value &);
-  virtual ~Mode();
+  ~Mode();

  // Handlers for wayland events
  void handle_mode(const char *mode);
--- a/include/modules/river/tags.hpp
+++ b/include/modules/river/tags.hpp
@ -14,7 +14,7 @@ namespace waybar::modules::river {
 class Tags : public waybar::AModule {
 public:
  Tags(const std::string &, const waybar::Bar &, const Json::Value &);
-  virtual ~Tags();
+  ~Tags();

  // Handlers for wayland events
  void handle_focused_tags(uint32_t tags);
--- a/include/modules/river/window.hpp
+++ b/include/modules/river/window.hpp
@ -13,7 +13,7 @@ namespace waybar::modules::river {
 class Window : public waybar::ALabel {
 public:
  Window(const std::string &, const waybar::Bar &, const Json::Value &);
-  virtual ~Window();
+  ~Window();

  // Handlers for wayland events
  void handle_focused_view(const char *title);
--- a/include/modules/simpleclock.hpp
+++ b/include/modules/simpleclock.hpp
@ -10,8 +10,8 @@ namespace waybar::modules {
 class Clock : public ALabel {
 public:
  Clock(const std::string&, const Json::Value&);
-  virtual ~Clock() = default;
-  auto update() -> void override;
+  ~Clock() = default;
+  auto update() -> void;

 private:
  util::SleeperThread thread_;
--- a/include/modules/sndio.hpp
+++ b/include/modules/sndio.hpp
@ -12,12 +12,12 @@ namespace waybar::modules {
 class Sndio : public ALabel {
 public:
  Sndio(const std::string &, const Json::Value &);
-  virtual ~Sndio();
-  auto update() -> void override;
+  ~Sndio();
+  auto update() -> void;
  auto set_desc(struct sioctl_desc *, unsigned int) -> void;
  auto put_val(unsigned int, unsigned int) -> void;
-  bool handleScroll(GdkEventScroll *) override;
-  bool handleToggle(GdkEventButton *const &) override;
+  bool handleScroll(GdkEventScroll *);
+  bool handleToggle(GdkEventButton *const &);

 private:
  auto connect_to_sndio() -> void;
--- a/include/modules/sni/tray.hpp
+++ b/include/modules/sni/tray.hpp
@ -13,8 +13,8 @@ namespace waybar::modules::SNI {
 class Tray : public AModule {
 public:
  Tray(const std::string&, const Bar&, const Json::Value&);
-  virtual ~Tray() = default;
-  auto update() -> void override;
+  ~Tray() = default;
+  auto update() -> void;

 private:
  void onAdd(std::unique_ptr<Item>& item);
--- a/include/modules/sway/ipc/client.hpp
+++ b/include/modules/sway/ipc/client.hpp
@ -8,8 +8,6 @@
 #include <cstring>
 #include <memory>
 #include <mutex>
-#include <stdexcept>
-#include <string>

 #include "ipc.hpp"
 #include "util/sleeper_thread.hpp"
--- a/include/modules/sway/language.hpp
+++ b/include/modules/sway/language.hpp
@ -17,8 +17,8 @@ namespace waybar::modules::sway {
 class Language : public ALabel, public sigc::trackable {
 public:
  Language(const std::string& id, const Json::Value& config);
-  virtual ~Language() = default;
-  auto update() -> void override;
+  ~Language() = default;
+  auto update() -> void;

 private:
  enum class DispayedShortFlag { None = 0, ShortName = 1, ShortDescription = 1 << 1 };
--- a/include/modules/sway/mode.hpp
+++ b/include/modules/sway/mode.hpp
@ -13,8 +13,8 @@ namespace waybar::modules::sway {
 class Mode : public ALabel, public sigc::trackable {
 public:
  Mode(const std::string&, const Json::Value&);
-  virtual ~Mode() = default;
-  auto update() -> void override;
+  ~Mode() = default;
+  auto update() -> void;

 private:
  void onEvent(const struct Ipc::ipc_response&);
--- a/include/modules/sway/scratchpad.hpp
+++ b/include/modules/sway/scratchpad.hpp
@ -15,8 +15,8 @@ namespace waybar::modules::sway {
 class Scratchpad : public ALabel {
 public:
  Scratchpad(const std::string&, const Json::Value&);
-  virtual ~Scratchpad() = default;
-  auto update() -> void override;
+  ~Scratchpad() = default;
+  auto update() -> void;

 private:
  auto getTree() -> void;
@ -32,4 +32,4 @@ class Scratchpad : public ALabel {
  Ipc ipc_;
  util::JsonParser parser_;
 };
-}  // namespace waybar::modules::sway
+}  // namespace waybar::modules::sway
--- a/include/modules/sway/window.hpp
+++ b/include/modules/sway/window.hpp
@ -4,7 +4,7 @@

 #include <tuple>

-#include "AAppIconLabel.hpp"
+#include "AIconLabel.hpp"
 #include "bar.hpp"
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
@ -12,30 +12,32 @@

 namespace waybar::modules::sway {

-class Window : public AAppIconLabel, public sigc::trackable {
+class Window : public AIconLabel, public sigc::trackable {
 public:
  Window(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~Window() = default;
-  auto update() -> void override;
+  ~Window() = default;
+  auto update() -> void;

 private:
-  void setClass(std::string classname, bool enable);
  void onEvent(const struct Ipc::ipc_response&);
  void onCmd(const struct Ipc::ipc_response&);
-  std::tuple<std::size_t, int, int, std::string, std::string, std::string, std::string, std::string>
-  getFocusedNode(const Json::Value& nodes, std::string& output);
+  std::tuple<std::size_t, int, std::string, std::string, std::string, std::string> getFocusedNode(
+      const Json::Value& nodes, std::string& output);
  void getTree();
+  void updateAppIconName();
+  void updateAppIcon();

  const Bar& bar_;
  std::string window_;
  int windowId_;
  std::string app_id_;
  std::string app_class_;
-  std::string layout_;
  std::string old_app_id_;
  std::size_t app_nb_;
  std::string shell_;
-  int floating_count_;
+  unsigned app_icon_size_{24};
+  bool update_app_icon_{true};
+  std::string app_icon_name_;
  util::JsonParser parser_;
  std::mutex mutex_;
  Ipc ipc_;
--- a/include/modules/sway/workspaces.hpp
+++ b/include/modules/sway/workspaces.hpp
@ -4,7 +4,6 @@
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>

-#include <string_view>
 #include <unordered_map>

 #include "AModule.hpp"
@ -18,13 +17,11 @@ namespace waybar::modules::sway {
 class Workspaces : public AModule, public sigc::trackable {
 public:
  Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~Workspaces() = default;
-  auto update() -> void override;
+  ~Workspaces() = default;
+  auto update() -> void;

 private:
-  static constexpr std::string_view workspace_switch_cmd_ = "workspace {} \"{}\"";
-  static constexpr std::string_view persistent_workspace_switch_cmd_ =
-      R"(workspace {} "{}"; move workspace to output "{}"; workspace {} "{}")";
+  static inline const std::string workspace_switch_cmd_ = "workspace {} \"{}\"";

  static int convertWorkspaceNameToNum(std::string name);

@ -37,11 +34,10 @@ class Workspaces : public AModule, public sigc::trackable {
  const std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
  uint16_t getWorkspaceIndex(const std::string& name) const;
  std::string trimWorkspaceName(std::string);
-  bool handleScroll(GdkEventScroll*) override;
+  bool handleScroll(GdkEventScroll*);

  const Bar& bar_;
  std::vector<Json::Value> workspaces_;
-  std::vector<std::string> high_priority_named_;
  std::vector<std::string> workspaces_order_;
  Gtk::Box box_;
  util::JsonParser parser_;
--- a/include/modules/temperature.hpp
+++ b/include/modules/temperature.hpp
@ -12,8 +12,8 @@ namespace waybar::modules {
 class Temperature : public ALabel {
 public:
  Temperature(const std::string&, const Json::Value&);
-  virtual ~Temperature() = default;
-  auto update() -> void override;
+  ~Temperature() = default;
+  auto update() -> void;

 private:
  float getTemperature();
--- a/include/modules/upower/upower.hpp
+++ b/include/modules/upower/upower.hpp
@ -19,8 +19,8 @@ namespace waybar::modules::upower {
 class UPower : public AModule {
 public:
  UPower(const std::string &, const Json::Value &);
-  virtual ~UPower();
-  auto update() -> void override;
+  ~UPower();
+  auto update() -> void;

 private:
  typedef std::unordered_map<std::string, UpDevice *> Devices;
@ -45,7 +45,7 @@ class UPower : public AModule {
  void resetDevices();
  void removeDevices();
  bool show_tooltip_callback(int, int, bool, const Glib::RefPtr<Gtk::Tooltip> &tooltip);
-  bool handleToggle(GdkEventButton *const &) override;
+  bool handleToggle(GdkEventButton *const &);
  std::string timeToString(gint64 time);

  const std::string getDeviceStatus(UpDeviceState &state);
@ -74,7 +74,6 @@ class UPower : public AModule {
  bool showAltText;
  bool upowerRunning;
  guint upowerWatcher_id;
-  std::string nativePath_;
 };

 }  // namespace waybar::modules::upower
--- a/include/modules/upower/upower_tooltip.hpp
+++ b/include/modules/upower/upower_tooltip.hpp
@ -24,7 +24,7 @@ class UPowerTooltip : public Gtk::Window {

 public:
  UPowerTooltip(uint iconSize, uint tooltipSpacing, uint tooltipPadding);
-  virtual ~UPowerTooltip();
+  ~UPowerTooltip();

  uint updateTooltip(Devices& devices);
 };
--- a/include/modules/user.hpp
+++ b/include/modules/user.hpp
@ -11,8 +11,8 @@ namespace waybar::modules {
 class User : public AIconLabel {
 public:
  User(const std::string&, const Json::Value&);
-  virtual ~User() = default;
-  auto update() -> void override;
+  ~User() = default;
+  auto update() -> void;

  bool handleToggle(GdkEventButton* const& e) override;

--- a/include/modules/wireplumber.hpp
+++ b/include/modules/wireplumber.hpp
@ -13,32 +13,25 @@ namespace waybar::modules {
 class Wireplumber : public ALabel {
 public:
  Wireplumber(const std::string&, const Json::Value&);
-  virtual ~Wireplumber();
-  auto update() -> void override;
+  ~Wireplumber();
+  auto update() -> void;

 private:
  void loadRequiredApiModules();
  void prepare();
  void activatePlugins();
-  static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id);
-  static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id);
+  static void updateVolume(waybar::modules::Wireplumber* self);
+  static void updateNodeName(waybar::modules::Wireplumber* self);
+  static uint32_t getDefaultNodeId(waybar::modules::Wireplumber* self);
  static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
  static void onObjectManagerInstalled(waybar::modules::Wireplumber* self);
-  static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id);
-  static void onDefaultNodesApiChanged(waybar::modules::Wireplumber* self);
-
-  bool handleScroll(GdkEventScroll* e) override;

  WpCore* wp_core_;
  GPtrArray* apis_;
  WpObjectManager* om_;
-  WpPlugin* mixer_api_;
-  WpPlugin* def_nodes_api_;
-  gchar* default_node_name_;
  uint32_t pending_plugins_;
  bool muted_;
  double volume_;
-  double min_step_;
  uint32_t node_id_{0};
  std::string node_name_;
 };
--- a/include/modules/wlr/taskbar.hpp
+++ b/include/modules/wlr/taskbar.hpp
@ -40,8 +40,6 @@ class Task {
    FULLSCREEN = (1 << 3),
    INVALID = (1 << 4)
  };
-  // made public so TaskBar can reorder based on configuration.
-  Gtk::Button button;

 private:
  static uint32_t global_id;
@ -55,6 +53,7 @@ class Task {

  uint32_t id_;

+  Gtk::Button button_;
  Gtk::Box content_;
  Gtk::Image icon_;
  Gtk::Label text_before_;
--- a/include/modules/wlr/workspace_manager.hpp
+++ b/include/modules/wlr/workspace_manager.hpp
@ -22,7 +22,7 @@ class WorkspaceGroup;
 class Workspace {
 public:
  Workspace(const waybar::Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group,
-            zext_workspace_handle_v1 *workspace, uint32_t id, std::string name);
+            zext_workspace_handle_v1 *workspace, uint32_t id);
  ~Workspace();
  auto update() -> void;

@ -30,15 +30,11 @@ class Workspace {
  auto is_active() const -> bool { return state_ & static_cast<uint32_t>(State::ACTIVE); }
  auto is_urgent() const -> bool { return state_ & static_cast<uint32_t>(State::URGENT); }
  auto is_hidden() const -> bool { return state_ & static_cast<uint32_t>(State::HIDDEN); }
-  auto is_empty() const -> bool { return state_ & static_cast<uint32_t>(State::EMPTY); }
-  auto is_persistent() const -> bool { return persistent_; }
  // wlr stuff
  auto handle_name(const std::string &name) -> void;
  auto handle_coordinates(const std::vector<uint32_t> &coordinates) -> void;
  auto handle_state(const std::vector<uint32_t> &state) -> void;
  auto handle_remove() -> void;
-  auto make_persistent() -> void;
-  auto handle_duplicate() -> void;

  auto handle_done() -> void;
  auto handle_clicked(GdkEventButton *bt) -> bool;
@ -52,7 +48,6 @@ class Workspace {
    ACTIVE = (1 << 0),
    URGENT = (1 << 1),
    HIDDEN = (1 << 2),
-    EMPTY = (1 << 3),
  };

 private:
@ -72,7 +67,6 @@ class Workspace {
  static std::map<std::string, std::string> icons_map_;
  std::string format_;
  bool with_icon_ = false;
-  bool persistent_ = false;

  Gtk::Button button_;
  Gtk::Box content_;
@ -93,14 +87,11 @@ class WorkspaceGroup {
  auto active_only() const -> bool;
  auto creation_delayed() const -> bool;
  auto workspaces() -> std::vector<std::unique_ptr<Workspace>> & { return workspaces_; }
-  auto persistent_workspaces() -> std::vector<std::string> & { return persistent_workspaces_; }

  auto sort_workspaces() -> void;
  auto set_need_to_sort() -> void { need_to_sort = true; }
  auto add_button(Gtk::Button &button) -> void;
  auto remove_button(Gtk::Button &button) -> void;
-  auto fill_persistent_workspaces() -> void;
-  auto create_persistent_workspaces() -> void;

  // wlr stuff
  auto handle_workspace_create(zext_workspace_handle_v1 *workspace_handle) -> void;
@ -124,8 +115,6 @@ class WorkspaceGroup {
  uint32_t id_;
  std::vector<std::unique_ptr<Workspace>> workspaces_;
  bool need_to_sort = false;
-  std::vector<std::string> persistent_workspaces_;
-  bool persistent_created_ = false;
 };

 class WorkspaceManager : public AModule {
--- a/include/util/clara.hpp
+++ b/include/util/clara.hpp
@ -989,7 +989,7 @@ struct Help : Opt {
          showHelpFlag = flag;
          return ParserResult::ok(ParseResultType::ShortCircuitAll);
        }) {
-    static_cast<Opt &>(*this)("display usage information")["-?"]["-h"]["--help"].optional();
+    static_cast<Opt &> (*this)("display usage information")["-?"]["-h"]["--help"].optional();
  }
 };

--- a/include/util/command.hpp
+++ b/include/util/command.hpp
@ -1,6 +1,5 @@
 #pragma once

-#include <fcntl.h>
 #include <giomm.h>
 #include <spdlog/spdlog.h>
 #include <sys/wait.h>
@ -69,11 +68,7 @@ inline int close(FILE* fp, pid_t pid) {
 inline FILE* open(const std::string& cmd, int& pid) {
  if (cmd == "") return nullptr;
  int fd[2];
-  // Open the pipe with the close-on-exec flag set, so it will not be inherited
-  // by any other subprocesses launched by other threads (which could result in
-  // the pipe staying open after this child dies, causing us to hang when trying
-  // to read from it)
-  if (pipe2(fd, O_CLOEXEC) != 0) {
+  if (pipe(fd) != 0) {
    spdlog::error("Unable to pipe fd");
    return nullptr;
  }
@ -82,8 +77,6 @@ inline FILE* open(const std::string& cmd, int& pid) {

  if (child_pid < 0) {
    spdlog::error("Unable to exec cmd {}, error {}", cmd.c_str(), strerror(errno));
-    ::close(fd[0]);
-    ::close(fd[1]);
    return nullptr;
  }

--- a/include/util/date.hpp
+++ b/include/util/date.hpp
@ -1,60 +0,0 @@
-#pragma once
-
-#include <fmt/format.h>
-
-#if HAVE_CHRONO_TIMEZONES
-#include <chrono>
-#include <format>
-
-/* Compatibility layer for <date/tz.h> on top of C++20 <chrono> */
-namespace date {
-
-using namespace std::chrono;
-
-namespace literals {
-using std::chrono::last;
-}
-
-inline auto format(const std::string& spec, const auto& ztime) {
-  return spec.empty() ? "" : std::vformat("{:L" + spec + "}", std::make_format_args(ztime));
-}
-
-inline auto format(const std::locale& loc, const std::string& spec, const auto& ztime) {
-  return spec.empty() ? "" : std::vformat(loc, "{:L" + spec + "}", std::make_format_args(ztime));
-}
-
-}  // namespace date
-
-#else
-#include <date/tz.h>
-#endif
-
-template <typename Duration, typename TimeZonePtr>
-struct fmt::formatter<date::zoned_time<Duration, TimeZonePtr>> {
-  std::string_view specs;
-
-  template <typename ParseContext>
-  constexpr auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    auto it = ctx.begin();
-    if (it != ctx.end() && *it == ':') {
-      ++it;
-    }
-    auto end = it;
-    while (end != ctx.end() && *end != '}') {
-      ++end;
-    }
-    if (end != it) {
-      specs = {it, std::string_view::size_type(end - it)};
-    }
-    return end;
-  }
-
-  template <typename FormatContext>
-  auto format(const date::zoned_time<Duration, TimeZonePtr>& ztime, FormatContext& ctx) {
-    if (ctx.locale()) {
-      const auto loc = ctx.locale().template get<std::locale>();
-      return fmt::format_to(ctx.out(), "{}", date::format(loc, fmt::to_string(specs), ztime));
-    }
-    return fmt::format_to(ctx.out(), "{}", date::format(fmt::to_string(specs), ztime));
-  }
-};
--- a/include/util/format.hpp
+++ b/include/util/format.hpp
@ -66,9 +66,9 @@ struct formatter<pow_format> {
    std::string string;
    switch (spec) {
      case '>':
-        return fmt::format_to(ctx.out(), "{:>{}}", fmt::format("{}", s), max_width);
+        return format_to(ctx.out(), "{:>{}}", fmt::format("{}", s), max_width);
      case '<':
-        return fmt::format_to(ctx.out(), "{:<{}}", fmt::format("{}", s), max_width);
+        return format_to(ctx.out(), "{:<{}}", fmt::format("{}", s), max_width);
      case '=':
        format = "{coefficient:<{number_width}.1f}{padding}{prefix}{unit}";
        break;
@ -77,8 +77,8 @@ struct formatter<pow_format> {
        format = "{coefficient:.1f}{prefix}{unit}";
        break;
    }
-    return fmt::format_to(
-        ctx.out(), fmt::runtime(format), fmt::arg("coefficient", fraction),
+    return format_to(
+        ctx.out(), format, fmt::arg("coefficient", fraction),
        fmt::arg("number_width", number_width),
        fmt::arg("prefix", std::string() + units[pow] + ((s.binary_ && pow) ? "i" : "")),
        fmt::arg("unit", s.unit_),
@ -93,7 +93,7 @@ template <>
 struct formatter<Glib::ustring> : formatter<std::string> {
  template <typename FormatContext>
  auto format(const Glib::ustring& value, FormatContext& ctx) {
-    return formatter<std::string>::format(static_cast<std::string>(value), ctx);
+    return formatter<std::string>::format(value, ctx);
  }
 };
 }  // namespace fmt
--- a/include/util/gtk_icon.hpp
+++ b/include/util/gtk_icon.hpp
@ -1,14 +0,0 @@
-#pragma once
-#include <gtkmm/icontheme.h>
-
-#include <mutex>
-#include <string>
-
-class DefaultGtkIconThemeWrapper {
- private:
-  static std::mutex default_theme_mutex;
-
- public:
-  static bool has_icon(const std::string&);
-  static Glib::RefPtr<Gdk::Pixbuf> load_icon(const char*, int, Gtk::IconLookupFlags);
-};
--- a/include/util/prepare_for_sleep.h
+++ b/include/util/prepare_for_sleep.h
@ -1,9 +0,0 @@
-#pragma once
-
-#include "SafeSignal.hpp"
-
-namespace waybar::util {
-
-// Get a signal emited with value true when entering sleep, and false when exiting
-SafeSignal<bool>& prepare_for_sleep();
-}  // namespace waybar::util
--- a/include/util/rewrite_string.hpp
+++ b/include/util/rewrite_string.hpp
@ -4,5 +4,5 @@
 #include <string>

 namespace waybar::util {
-std::string rewriteString(const std::string&, const Json::Value&);
+std::string rewriteTitle(const std::string&, const Json::Value&);
 }
--- a/include/util/sleeper_thread.hpp
+++ b/include/util/sleeper_thread.hpp
@ -6,8 +6,6 @@
 #include <functional>
 #include <thread>

-#include "prepare_for_sleep.h"
-
 namespace waybar::util {

 /**
@ -35,11 +33,7 @@ class SleeperThread {
            signal_ = false;
            func();
          }
-        }} {
-    connection_ = prepare_for_sleep().connect([this](bool sleep) {
-      if (not sleep) wake_up();
-    });
-  }
+        }} {}

  SleeperThread& operator=(std::function<void()> func) {
    thread_ = std::thread([this, func] {
@ -48,11 +42,6 @@ class SleeperThread {
        func();
      }
    });
-    if (connection_.empty()) {
-      connection_ = prepare_for_sleep().connect([this](bool sleep) {
-        if (not sleep) wake_up();
-      });
-    }
    return *this;
  }

@ -72,7 +61,7 @@ class SleeperThread {
    return condvar_.wait_until(lk, time_point, [this] { return signal_ || !do_run_; });
  }

-  void wake_up() {
+  auto wake_up() {
    {
      std::lock_guard<std::mutex> lck(mutex_);
      signal_ = true;
@ -95,7 +84,6 @@ class SleeperThread {
  }

  ~SleeperThread() {
-    connection_.disconnect();
    stop();
    if (thread_.joinable()) {
      thread_.join();
@ -108,7 +96,6 @@ class SleeperThread {
  std::mutex mutex_;
  bool do_run_ = true;
  bool signal_ = false;
-  sigc::connection connection_;
 };

 }  // namespace waybar::util
--- a/include/util/waybar_time.hpp
+++ b/include/util/waybar_time.hpp
@ -0,0 +1,39 @@
+#pragma once
+
+#include <date/tz.h>
+#include <fmt/format.h>
+
+namespace waybar {
+
+struct waybar_time {
+  std::locale locale;
+  date::zoned_seconds ztime;
+};
+
+}  // namespace waybar
+
+template <>
+struct fmt::formatter<waybar::waybar_time> {
+  std::string_view specs;
+
+  template <typename ParseContext>
+  constexpr auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    auto it = ctx.begin();
+    if (it != ctx.end() && *it == ':') {
+      ++it;
+    }
+    auto end = it;
+    while (end != ctx.end() && *end != '}') {
+      ++end;
+    }
+    if (end != it) {
+      specs = {it, std::string_view::size_type(end - it)};
+    }
+    return end;
+  }
+
+  template <typename FormatContext>
+  auto format(const waybar::waybar_time& t, FormatContext& ctx) {
+    return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(specs), t.ztime));
+  }
+};
--- a/man/waybar-backlight.5.scd
+++ b/man/waybar-backlight.5.scd
@ -25,12 +25,12 @@ The *backlight* module displays the current backlight level.
 	The maximum length in characters the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *rotate*: ++
 	typeof: integer ++
@ -58,32 +58,23 @@ The *backlight* module displays the current backlight level.

 *on-scroll-up*: ++
 	typeof: string ++
-	Command to execute when performing a scroll up on the module. This replaces the default behaviour of brightness control.
+	Command to execute when performing a scroll up on the module.

 *on-scroll-down*: ++
 	typeof: string
-	Command to execute when performing a scroll down on the module. This replaces the default behaviour of brightness control.
+	Command to execute when performing a scroll down on the module.

 *smooth-scrolling-threshold*: ++
 	typeof: double
 	Threshold to be used when scrolling.

-*reverse-scrolling*: ++
-	typeof: bool ++
-	Option to reverse the scroll direction.
-
-*scroll-step*: ++
-	typeof: float ++
-	default: 1.0 ++
-	The speed in which to change the brightness when scrolling.
-
 # EXAMPLE:

 ```
 "backlight": {
-	"device": "intel_backlight",
-	"format": "{percent}% {icon}",
-	"format-icons": ["", ""]
+    "device": "intel_backlight",
+    "format": "{percent}% {icon}",
+    "format-icons": ["", ""]
 }
 ```

--- a/man/waybar-battery.5.scd
+++ b/man/waybar-battery.5.scd
@ -23,9 +23,9 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 	Define the max percentage of the battery, for when you've set the battery to stop charging at a lower level to save it. For example, if you've set the battery to stop at 80% that will become the new 100%.

 *design-capacity*: ++
-	typeof: bool ++
-	default: false ++
-	Option to use the battery design capacity instead of it's current maximal capacity.
+    typeof: bool ++
+    default: false ++
+    Option to use the battery design capacity instead of it's current maximal capacity.

 *interval*: ++
 	typeof: integer ++
@ -56,12 +56,12 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *rotate*: ++
 	typeof: integer++
@ -132,8 +132,8 @@ The *battery* module allows one to define custom formats based on up to two fact
 # STATES

 - Every entry (*state*) consists of a *<name>* (typeof: *string*) and a *<value>* (typeof: *integer*).
- The state can be addressed as a CSS class in the *style.css*. The name of the CSS class is the *<name>* of the state.	Each class gets activated when the current capacity is equal or below the configured *<value>*.
- Also each state can have its own *format*. Those con be configured via *format-<name>*. Or if you want to differentiate a bit more even as *format-<status>-<state>*. For more information see *custom-formats*.
+	- The state can be addressed as a CSS class in the *style.css*. The name of the CSS class is the *<name>* of the state.	Each class gets activated when the current capacity is equal or below the configured *<value>*.
+	- Also each state can have its own *format*. Those con be configured via *format-<name>*. Or if you want to differentiate a bit more even as *format-<status>-<state>*. For more information see *custom-formats*.



@ -141,15 +141,15 @@ The *battery* module allows one to define custom formats based on up to two fact

 ```
 "battery": {
-	"bat": "BAT2",
-	"interval": 60,
-	"states": {
-		"warning": 30,
-		"critical": 15
-	},
-	"format": "{capacity}% {icon}",
-	"format-icons": ["", "", "", "", ""],
-	"max-length": 25
+    "bat": "BAT2",
+    "interval": 60,
+    "states": {
+        "warning": 30,
+        "critical": 15
+    },
+    "format": "{capacity}% {icon}",
+    "format-icons": ["", "", "", "", ""],
+    "max-length": 25
 }
 ```

--- a/man/waybar-bluetooth.5.scd
+++ b/man/waybar-bluetooth.5.scd
@ -42,10 +42,6 @@ Addressed by *bluetooth*
 	typeof: string ++
 	This format is used when the displayed controller is connected to at least 1 device.

-*format-no-controller*: ++
-	typeof: string ++
-	This format is used when no bluetooth controller could be found
-
 *format-icons*: ++
 	typeof: array/object ++
 	Based on the current battery percentage (see section *EXPERIMENTAL BATTERY PERCENTAGE FEATURE*), the corresponding icon gets selected. ++
@ -61,12 +57,12 @@ Addressed by *bluetooth*
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
 	typeof: string ++
@ -117,10 +113,6 @@ Addressed by *bluetooth*
 	typeof: string ++
 	This format is used when the displayed controller is connected to at least 1 device.

-*tooltip-format-no-controller*: ++
-	typeof: string ++
-	This format is used when no bluetooth controller could be found
-
 *tooltip-format-enumerate-connected*: ++
 	typeof: string ++
 	This format is used to define how each connected device should be displayed within the *device_enumerate* format replacement in the tooltip menu.
--- a/man/waybar-cava.5.scd
+++ b/man/waybar-cava.5.scd
@ -1,182 +0,0 @@
-waybar-cava(5) "waybar-cava" "User Manual"
-
-# NAME
-
-waybar - cava module
-
-# DESCRIPTION
-
-*cava* module for karlstav/cava project. See it on github: https://github.com/karlstav/cava.
-
-
-# FILES
-
-$XDG_CONFIG_HOME/waybar/config ++
-	Per user configuration file
-
-# ADDITIONAL FILES
-
-libcava lives in:
-
-. /usr/lib/libcava.so or /usr/lib64/libcava.so
-. /usr/lib/pkgconfig/cava.pc or /usr/lib64/pkgconfig/cava.pc
-. /usr/include/cava
-
-# CONFIGURATION
-
-[- *Option*
-:- *Typeof*
-:- *Default*
-:- *Description*
-|[ *cava_config*
-:[ string
-:[
-:< Path where cava configuration file is placed to
-|[ *framerate*
-:[ integer
-:[ 30
-:[ rames per second. Is used as a replacement for *interval*
-|[ *autosens*
-:[ integer
-:[ 1
-:[ Will attempt to decrease sensitivity if the bars peak
-|[ *sensitivity*
-:[ integer
-:[ 100
-:[ Manual sensitivity in %. It's recommended to be omitted when *autosens* = 1
-|[ *bars*
-:[ integer
-:[ 12
-:[ The number of bars
-|[ *lower_cutoff_freq*
-:[ long integer
-:[ 50
-:[ Lower cutoff frequencies for lowest bars the bandwidth of the visualizer
-|[ *higher_cutoff_freq*
-:[ long integer
-:[ 10000
-:[ Higher cutoff frequencies for highest bars the bandwidth of the visualizer
-|[ *sleep_timer*
-:[ integer
-:[ 5
-:[ Seconds with no input before cava main thread goes to sleep mode
-|[ *method*
-:[ string
-:[ pulse
-:[ Audio capturing method. Possible methods are: pipewire, pulse, alsa, fifo, sndio or shmem
-|[ *source*
-:[ string
-:[ auto
-:[ See cava configuration
-|[ *sample_rate*
-:[ long integer
-:[ 44100
-:[ See cava configuration
-|[ *sample_bits*
-:[ integer
-:[ 16
-:[ See cava configuration
-|[ *stereo*
-:[ bool
-:[ true
-:[ Visual channels
-|[ *reverse*
-:[ bool
-:[ false
-:[ Displays frequencies the other way around
-|[ *bar_delimiter*
-:[ integer
-:[ 0
-:[ Each bar is separated by a delimiter. Use decimal value in ascii table(i.e. 59 = ";"). 0 means no delimiter
-|[ *monstercat*
-:[ bool
-:[ false
-:[ Disables or enables the so-called "Monstercat smoothing" with of without "waves"
-|[ *waves*
-:[ bool
-:[ false
-:[ Disables or enables the so-called "Monstercat smoothing" with of without "waves"
-|[ *noise_reduction*
-:[ double
-:[ 0.77
-:[ Range between 0 - 1. The raw visualization is very noisy, this factor adjust the integral and gravity filters to keep the signal smooth. 1 - will be very slow and smooth, 0 - will be fast but noisy
-|[ *input_delay*
-:[ integer
-:[ 2
-:[ Sets the delay before fetching audio source thread start working. On author machine Waybar starts much faster then pipewire audio server, and without a little delay cava module fails due to pipewire is not ready
-|[ *ascii_max_range*
-:[ integer
-:[ 7
-:[ It's impossible to set it directly. The value is dictated by the number of icons in the array *format-icons*
-|[ *data_format*
-:[ string
-:[ asci
-:[ It's impossible to set it. Waybar sets it to = asci for internal needs
-|[ *raw_target*
-:[ string
-:[ /dev/stdout
-:[ It's impossible to set it. Waybar sets it to = /dev/stdout for internal needs
-
-Configuration can be provided as:
- The only cava configuration file which is provided through *cava_config*. The rest configuration can be skipped
- Without cava configuration file. In such case cava should be configured through provided list of the configuration option
- Mix. When provided both And cava configuration file And configuration options. In such case waybar applies configuration file first then overrides particular options by the provided list of configuration options
-
-# ACTIONS
-
-[- *String*
-:- *Action*
-|[ *mode*
-:< Switch main cava thread and fetching audio source thread from/to pause/resume
-
-# DEPENDENCIES
-
- iniparser
- fftw3
-
-# SOLVING ISSUES
-
-. On start Waybar throws an exception "error while loading shared libraries: libcava.so: cannot open shared object file: No such file or directory".
-  It might happen when libcava for some reason hasn't been registered in the system. sudo ldconfig should help
-. Waybar is starting but cava module doesn't react on the music
-	1. In such case for at first need to make sure usual cava application is working as well
-	2. If so, need to comment all configuration options. Uncomment cava_config and provide the path to the working cava config
-	3. You might set too huge or too small input_delay. Try to setup to 4 seconds, restart waybar and check again 4 seconds past. Usual even on weak machines it should be enough
-	4. You might accidentally switched action mode to pause mode
-
-# RISING ISSUES
-
-For clear understanding: this module is a cava API's consumer. So for any bugs related to cava engine you should contact to Cava upstream(https://github.com/karlstav/cava) ++
-with the one Exception. Cava upstream doesn't provide cava as a shared library. For that this module author made a fork libcava(https://github.com/LukashonakV/cava). ++
-So the order is:
-. cava upstream
-. libcava upstream.
-In case when cava releases new version and you're wanna get it, it should be raised an issue to libcava(https://github.com/LukashonakV/cava) with title ++
-\[Bump\]x.x.x where x.x.x is cava release version.
-
-# EXAMPLES
-
-```
-"cava": {
-	//"cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
-	"framerate": 30,
-	"autosens": 1,
-	//"sensitivity": 100,
-	"bars": 14,
-	"lower_cutoff_freq": 50,
-	"higher_cutoff_freq": 10000,
-	"method": "pulse",
-	"source": "auto",
-	"stereo": true,
-	"reverse": false,
-	"bar_delimiter": 0,
-	"monstercat": false,
-	"waves": false,
-	"noise_reduction": 0.77,
-	"input_delay": 2,
-	"format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
-	"actions": {
-		"on-click-right": "mode"
-	}
-},
-```
--- a/man/waybar-clock.5.scd
+++ b/man/waybar-clock.5.scd
@ -1,4 +1,4 @@
-waybar-clock(5) "waybar-clock" "User Manual"
+waybar-clock(5)

 # NAME

@ -6,265 +6,108 @@ waybar - clock module

 # DESCRIPTION

-*clock* module displays current date and time
-
-# FILES
-
-$XDG_CONFIG_HOME/waybar/config ++
-	Per user configuration file
+The *clock* module displays the current date and time.

 # CONFIGURATION

-1. Addressed by *clock*
-[- *Option*
-:- *Typeof*
-:- *Default*
-:- *Description*
-|[ *interval*
-:[ integer
-:[ 60
-:[ The interval in which the information gets polled
-|[ *format*
-:[ string
-:[ *{:%H:%M}*
-:[ The format, how the date and time should be displayed. See format options below
-|[ *timezone*
-:[ string
-:[
-:[ The timezone to display the time in, e.g. America/New_York. "" represents
-   the system's local timezone. See Wikipedia's unofficial list of timezones <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>
-|[ *timezones*
-:[ list of strings
-:[
-:[ A list of timezones (as in *timezone*) to use for time display, changed using
-   the scroll wheel. Do not specify *timezone* option when *timezones* is specified.
-   "" represents the system's local timezone
-|[ *locale*
-:[ string
-:[
-:[ A locale to be used to display the time. Intended to render times in custom
-   timezones with the proper language and format
-|[ *max-length*
-:[ integer
-:[
-:[ The maximum length in character the module should display
-|[ *rotate*
-:[ integer
-:[
-:[ Positive value to rotate the text label
-|[ *on-click*
-:[ string
-:[
-:[ Command to execute when clicked on the module
-|[ *on-click-middle*
-:[ string
-:[
-:[ Command to execute when you middle clicked on the module using mousewheel
-|[ *on-click-right*
-:[ string
-:[
-:[ Command to execute when you right clicked on the module
-|[ *on-scroll-up*
-:[ string
-:[
-:[ Command to execute when scrolling up on the module
-|[ *on-scroll-down*
-:[ string
-:[
-:[ Command to execute when scrolling down on the module
-|[ *smooth-scrolling-threshold*
-:[ double
-:[
-:[ Threshold to be used when scrolling
-|[ *tooltip*
-:[ bool
-:[ true
-:[ Option to enable tooltip on hover
-|[ *tooltip-format*
-:[ string
-:[ same as format
-:[ Tooltip on hover
+*interval*: ++
+	typeof: integer ++
+	default: 60 ++
+	The interval in which the information gets polled.

-View all valid format options in *strftime(3)* or have a look <https://fmt.dev/latest/syntax.html#chrono-specs>
+*format*: ++
+	typeof: string ++
+	default: {:%H:%M} ++
+	The format, how the date and time should be displayed. ++
+	It uses the format of the date library. See https://howardhinnant.github.io/date/date.html#to_stream_formatting for details.

-2. Addressed by *clock: calendar*
-[- *Option*
-:- *Typeof*
-:- *Default*
-:- *Description*
-|[ *mode*
-:[ string
-:[ month
-:[ Calendar view mode. Possible values: year|month
-|[ *mode-mon-col*
-:[ integer
-:[ 3
-:[ Relevant for *mode=year*. Count of months per row
-|[ *weeks-pos*
-:[ integer
-:[
-:[ The position where week numbers should be displayed. Disabled when is empty.
-   Possible values: left|right
-|[ *on-scroll*
-:[ integer
-:[ 1
-:[ Value to scroll months/years forward/backward. Can be negative. Is
-   configured under *on-scroll* option
+*timezone*: ++
+	typeof: string ++
+	default: inferred local timezone ++
+	The timezone to display the time in, e.g. America/New_York. ++
+	This field will be ignored if *timezones* field is set and have at least one value.

-3. Addressed by *clock: calendar: format*
-[- *Option*
-:- *Typeof*
-:- *Default*
-:- *Description*
-|[ *months*
-:[ string
-:[
-:[ Format is applied to months header(January, February,...etc.)
-|[ *days*
-:[ string
-:[
-:[ Format is applied to days
-|[ *weeks*
-:[ string
-:[ *{:%U}*
-:[ Format is applied to week numbers. When weekday format is not provided then
-   is used default format: '{:%W}' when week starts with Monday, '{:%U}' otherwise
-|[ *weekdays*
-:[ string
-:[
-:[ Format is applied to weeks header(Su,Mo,...etc.)
-|[ *today*
-:[ string
-:[ *<b><u>{}</u></b>*
-:[ Format is applied to Today
+*timezones*: ++
+	typeof: list of strings ++
+	A list of timezones to use for time display, changed using the scroll wheel. ++
+	Use "" to represent the system's local timezone.  Using %Z in the format or tooltip format is useful to track which time zone is currently displayed.

-## Actions
+*locale*: ++
+	typeof: string ++
+	default: inferred from current locale ++
+	A locale to be used to display the time. Intended to render times in custom timezones with the proper language and format.

-[- *String*
-:- *Action*
-|[ *mode*
-:[ Switch calendar mode between year/month
-|[ *tz_up*
-:[ Switch to the next provided time zone
-|[ *tz_down*
-:[ Switch to the previous provided time zone
-|[ *shift_up*
-:[ Switch to the next calendar month/year
-|[ *shift_down*
-:[ Switch to the previous calendar month/year
+*today-format*: ++
+	typeof: string ++
+	default: <b><u>{}</u></b> ++
+	The format of today's date in the calendar.
+
+*max-length*: ++
+	typeof: integer ++
+	The maximum length in character the module should display.
+
+*min-length*: ++
+    typeof: integer ++
+    The minimum length in characters the module should take up.
+
+*align*: ++
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*rotate*: ++
+	typeof: integer ++
+	Positive value to rotate the text label.
+
+*on-click*: ++
+	typeof: string ++
+	Command to execute when clicked on the module.
+
+*on-click-middle*: ++
+	typeof: string ++
+	Command to execute when middle-clicked on the module using mousewheel.
+
+*on-click-right*: ++
+	typeof: string ++
+	Command to execute when you right clicked on the module.
+
+*on-update*: ++
+	typeof: string ++
+	Command to execute when the module is updated.
+
+*on-scroll-up*: ++
+	typeof: string ++
+	Command to execute when scrolling up on the module.
+
+*on-scroll-down*: ++
+	typeof: string ++
+	Command to execute when scrolling down on the module.
+
+*smooth-scrolling-threshold*: ++
+	typeof: double ++
+	Threshold to be used when scrolling.
+
+*tooltip*: ++
+	typeof: bool ++
+	default: true ++
+	Option to disable tooltip on hover.
+
+View all valid format options in *strftime(3)*.

 # FORMAT REPLACEMENTS

- *{calendar}*: Current month calendar
- *{timezoned_time_list}*: List of time in the rest timezones, if more than one timezone is set in the config
+*{calendar}*: Current month calendar
+*{timezoned_time_list}*: List of time in the rest timezones, if more than one timezone is set in the config

 # EXAMPLES

-1. General
-
 ```
 "clock": {
-	"interval": 60,
-	"format": "{:%H:%M}",
-	"max-length": 25
-}
-```
-
-2. Calendar
-
-```
-"clock": {
-	"format": "{:%H:%M}  ",
-	"format-alt": "{:%A, %B %d, %Y (%R)}  ",
-	"tooltip-format": "<tt><small>{calendar}</small></tt>",
-	"calendar": {
-		"mode"          : "year",
-		"mode-mon-col"  : 3,
-		"weeks-pos"     : "right",
-		"on-scroll"     : 1,
-		"on-click-right": "mode",
-		"format": {
-			"months":     "<span color='#ffead3'><b>{}</b></span>",
-			"days":       "<span color='#ecc6d9'><b>{}</b></span>",
-			"weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
-			"weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
-			"today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
-		}
-	},
-	"actions": {
-		"on-click-right": "mode",
-		"on-click-forward": "tz_up",
-		"on-click-backward": "tz_down",
-		"on-scroll-up": "shift_up",
-		"on-scroll-down": "shift_down"
-	}
-},
-```
-
-3. Full date on hover
-
-```
-"clock": {
-	"interval": 60,
-	"tooltip": true,
-	"format": "{:%H.%M}",
-	"tooltip-format": "{:%Y-%m-%d}",
+    "interval": 60,
+    "format": "{:%H:%M}",
+    "max-length": 25
 }
 ```

 # STYLE

 - *#clock*
-
-# Troubleshooting
-
-If clock module is disabled at startup with locale::facet::\_S\_create\_c\_locale ++
-name not valid error message try one of the followings:
-
- check if LC_TIME is set properly (glibc)
- set locale to C in the config file (musl)
-
-The locale option must be set for {calendar} to use the correct start-of-week, regardless of system locale.
-
-## Calendar in Chinese. Alignment
-
-In order to have aligned Chinese calendar there are some useful recommendations:
-
-. Use "WenQuanYi Zen Hei Mono" which is provided in most Linux distributions
-. Try different font sizes and find best for you. size = 9pt should be fine
-. In case when "WenQuanYi Zen Hei Mono" font is used disable monospace font pango tag
-
-Example of working config
-
-```
-"clock": {
-	"format": "{:%H:%M}  ",
-	"format-alt": "{:%A, %B %d, %Y (%R)}  ",
-	"tooltip-format": "\n<span size='9pt' font='WenQuanYi Zen Hei Mono'>{calendar}</span>",
-	"calendar": {
-		"mode"          : "year",
-		"mode-mon-col"  : 3,
-		"weeks-pos"     : "right",
-		"on-scroll"     : 1,
-		"on-click-right": "mode",
-		"format": {
-			"months":     "<span color='#ffead3'><b>{}</b></span>",
-			"days":       "<span color='#ecc6d9'><b>{}</b></span>",
-			"weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
-			"weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
-			"today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
-		}
-	},
-	"actions": {
-		"on-click-right": "mode",
-		"on-click-forward": "tz_up",
-		"on-click-backward": "tz_down",
-		"on-scroll-up": "shift_up",
-		"on-scroll-down": "shift_down"
-	}
-},
-```
-
-# AUTHOR
-
-Alexis Rouillard <contact@arouillard.fr>
--- a/man/waybar-cpu.5.scd
+++ b/man/waybar-cpu.5.scd
@ -30,12 +30,12 @@ The *cpu* module displays the current cpu utilization.
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *rotate*: ++
 	typeof: integer ++
--- a/man/waybar-custom.5.scd
+++ b/man/waybar-custom.5.scd
@ -1,4 +1,5 @@
 waybar-custom(5)
+
 # NAME

 waybar - custom module
@ -18,13 +19,14 @@ Addressed by *custom/<name>*

 *exec-if*: ++
 	typeof: string ++
-	The path to a script, which determines if the script in *exec* should be executed. ++
+	The path to a script, which determines if the script in *exec* should be executed.
 	*exec* will be executed if the exit code of *exec-if* equals 0.

 *exec-on-event*: ++
 	typeof: bool ++
 	default: true ++
-	If an event command is set (e.g. *on-click* or *on-scroll-up*) then re-execute the script after executing the event command.
+	If an event command is set (e.g. *on-click* or *on-scroll-up*) then re-execute the script after
+	executing the event command.

 *return-type*: ++
 	typeof: string ++
@ -32,19 +34,20 @@ Addressed by *custom/<name>*

 *interval*: ++
 	typeof: integer ++
-	The interval (in seconds) in which the information gets polled. ++
-	Use *once* if you want to execute the module only on startup. ++
-	You can update it manually with a signal. If no *interval* is defined, it is assumed that the out script loops it self.
+	The interval (in seconds) in which the information gets polled.
+	Use *once* if you want to execute the module only on startup.
+	You can update it manually with a signal. If no *interval* is defined,
+	it is assumed that the out script loops it self.

 *restart-interval*: ++
 	typeof: integer ++
-	The restart interval (in seconds). ++
-	Can't be used with the *interval* option, so only with continuous scripts. ++
+	The restart interval (in seconds).
+	Can't be used with the *interval* option, so only with continuous scripts.
 	Once the script exit, it'll be re-executed after the *restart-interval*.

 *signal*: ++
 	typeof: integer ++
-	The signal number used to update the module. ++
+	The signal number used to update the module.
 	The number is valid between 1 and N, where *SIGRTMIN+N* = *SIGRTMAX*.

 *format*: ++
@ -65,12 +68,12 @@ Addressed by *custom/<name>*
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
 	typeof: string ++
--- a/man/waybar-disk.5.scd
+++ b/man/waybar-disk.5.scd
@ -40,12 +40,12 @@ Addressed by *disk*
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
 	typeof: string ++
--- a/man/waybar-dwl-tags.5.scd
+++ b/man/waybar-dwl-tags.5.scd
@ -1,49 +0,0 @@
-waybar-dwl-tags(5)
-
-# NAME
-
-waybar - dwl tags module
-
-# DESCRIPTION
-
-The *tags* module displays the current state of tags in dwl.
-
-# CONFIGURATION
-
-Addressed by *dwl/tags*
-
-*num-tags*: ++
-	typeof: uint ++
-	default: 9 ++
-	The number of tags that should be displayed. Max 32.
-
-*tag-labels*: ++
-	typeof: array ++
-	The label to display for each tag.
-
-*disable-click*: ++
-	typeof: bool ++
-	default: false ++
-	If set to false, you can left click to set focused tag. Right click to toggle tag focus. If set to true this behaviour is disabled.
-
-# EXAMPLE
-
-```
-"dwl/tags": {
-	"num-tags": 5
-}
-```
-
-# STYLE
-
- *#tags button*
- *#tags button.occupied*
- *#tags button.focused*
- *#tags button.urgent*
-
-Note that occupied/focused/urgent status may overlap. That is, a tag may be
-both occupied and focused at the same time.
-
-# SEE ALSO
-
-waybar(5), dwl(1)
--- a/man/waybar-hyprland-language.5.scd
+++ b/man/waybar-hyprland-language.5.scd
@ -15,36 +15,26 @@ Addressed by *hyprland/language*
 *format*: ++
 	typeof: string ++
 	default: {} ++
-	The format, how information should be displayed.
+	The format, how information should be displayed. On {} the currently selected language is displayed.

 *format-<lang>* ++
-	typeof: string++
-	Provide an alternative name to display per language where <lang> is the language of your choosing. Can be passed multiple times with multiple languages as shown by the example below.
+    typeof: string++
+    Provide an alternative name to display per language where <lang> is the language of your choosing. Can be passed multiple times with multiple languages as shown by the example below.

 *keyboard-name*: ++
-	typeof: string ++
-	Specifies which keyboard to use from hyprctl devices output. Using the option that begins with "at-translated-set..." is recommended.
+    typeof: string ++
+    Specifies which keyboard to use from hyprctl devices output. Using the option that begins with "at-translated-set..." is recommended.


-# FORMAT REPLACEMENTS
-
-*{short}*: Short name of layout (e.g. "us"). Equals to {}.
-
-*{shortDescription}*: Short description of layout (e.g. "en").
-
-*{long}*: Long name of layout (e.g. "English (Dvorak)").
-
-*{variant}*: Variant of layout (e.g. "dvorak").
-

 # EXAMPLES

 ```
 "hyprland/language": {
-	"format": "Lang: {long}"
-	"format-en": "AMERICA, HELL YEAH!"
-	"format-tr": "As bayrakları"
-	"keyboard-name": "at-translated-set-2-keyboard"
+    "format": "Lang: {}"
+    "format-en": "AMERICA, HELL YEAH!"
+    "format-tr": "As bayrakları"
+    "keyboard-name": "at-translated-set-2-keyboard"
 }
 ```

--- a/man/waybar-hyprland-submap.5.scd
+++ b/man/waybar-hyprland-submap.5.scd
@ -26,12 +26,12 @@ Addressed by *hyprland/submap*
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
 	typeof: string ++
@ -71,9 +71,9 @@ Addressed by *hyprland/submap*

 ```
 "hyprland/submap": {
-	"format": "✌️ {}",
-	"max-length": 8,
-	"tooltip": false
+    "format": "✌️ {}",
+    "max-length": 8,
+    "tooltip": false
 }
 ```

--- a/man/waybar-hyprland-window.5.scd
+++ b/man/waybar-hyprland-window.5.scd
@ -14,38 +14,13 @@ Addressed by *hyprland/window*

 *format*: ++
 	typeof: string ++
-	default: {title} ++
+	default: {} ++
 	The format, how information should be displayed. On {} the current window title is displayed.

 *rewrite*: ++
 	typeof: object ++
 	Rules to rewrite window title. See *rewrite rules*.

-*separate-outputs*: ++
-	typeof: bool ++
-	Show the active window of the monitor the bar belongs to, instead of the focused window.
-
-*icon*: ++
-	typeof: bool ++
-	default: false ++
-	Option to hide the application icon.
-
-*icon-size*: ++
-	typeof: integer ++
-	default: 24 ++
-	Option to change the size of the application icon.
-
-# FORMAT REPLACEMENTS
-See the output of "hyprctl clients" for examples
-
-*{title}*: The current title of the focused window.
-
-*{initialTitle}*: The initial title of the focused window.
-
-*{class}*: The current class of the focused window.
-
-*{initialClass}*: The initial class of the focused window.
-
 # REWRITE RULES

 *rewrite* is an object where keys are regular expressions and values are
@ -62,28 +37,14 @@ Invalid expressions (e.g., mismatched parentheses) are skipped.

 ```
 "hyprland/window": {
-	"format": "{}",
-	"rewrite": {
-		"(.*) - Mozilla Firefox": "🌎 $1",
-		"(.*) - zsh": "> [$1]"
-	}
+    "format": "{}",
+    "rewrite": {
+      "(.*) - Mozilla Firefox": "🌎 $1",
+      "(.*) - zsh": "> [$1]"
+    }
 }
 ```

 # STYLE

 - *#window*
- *window#waybar.empty #window* When no windows are in the workspace
-
-The following classes are applied to the entire Waybar rather than just the
-window widget:
-
- *window#waybar.empty* When no windows are in the workspace
- *window#waybar.solo* When one tiled window is visible in the workspace
-  (floating windows may be present)
- *window#waybar.<app_id>* Where *<app_id>* is the *class* (e.g. *chromium*) of
-  the solo tiled window in the workspace (use *hyprctl clients* to see classes)
- *window#waybar.floating* When there are only floating windows in the workspace
- *window#waybar.fullscreen* When there is a fullscreen window in the workspace;
-  useful with Hyprland's *fullscreen, 1* mode
- *window#waybar.swallowing* When there is a swallowed window in the workspace
--- a/man/waybar-hyprland-workspaces.5.scd
+++ b/man/waybar-hyprland-workspaces.5.scd
@ -1,79 +0,0 @@
-waybar-hyprland-workspaces(5)
-
-# NAME
-
-waybar - hyprland workspaces module
-
-# DESCRIPTION
-
-The *workspaces* module displays the currently used workspaces in hyprland compositor.
-
-# CONFIGURATION
-
-Addressed by *hyprland/workspaces*
-
-*format*: ++
-	typeof: string ++
-	default: {id} ++
-	The format, how information should be displayed.
-
-*format-icons*: ++
-	typeof: array ++
-	Based on the workspace id and state, the corresponding icon gets selected. See *icons*.
-
-*show-special*: ++
-	typeof: bool ++
-	default: false ++
-	If set to true special workspaces will be shown.
-
-*all-outputs*: ++
-	typeof: bool ++
-	default: false ++
-	If set to false workspaces group will be shown only in assigned output. Otherwise all workspace groups are shown.
-
-# FORMAT REPLACEMENTS
-
-*{id}*: id of workspace assigned by compositor
-
-*{name}*: workspace name assigned by compositor
-
-*{icon}*: Icon, as defined in *format-icons*.
-
-# ICONS
-
-Additional to workspace name matching, the following *format-icons* can be set.
-
- *default*: Will be shown, when no string match is found.
- *active*: Will be shown, when workspace is active
- *special*: Will be shown on non-active special workspaces
- *persistent*: Will be shown on non-active persistent workspaces
-
-# EXAMPLES
-
-```
-"hyprland/workspaces": {
-	"format": "{name}: {icon}",
-	"format-icons": {
-		"1": "",
-		"2": "",
-		"3": "",
-		"4": "",
-		"5": "",
-		"active": "",
-		"default": ""
-	},
-	"persistent_workspaces": {
-		"*": 5, // 5 workspaces by default on every monitor
-		"HDMI-A-1": 3 // but only three on HDMI-A-1
-	}
-}
-```
-
-# Style
-
- *#workspaces*
- *#workspaces button*
- *#workspaces button.active*
- *#workspaces button.persistent*
- *#workspaces button.special*
- *#workspaces button.urgent*
--- a/man/waybar-idle-inhibitor.5.scd
+++ b/man/waybar-idle-inhibitor.5.scd
@ -28,12 +28,12 @@ screensaving, also known as "presentation mode".
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
 	typeof: string ++
@ -64,9 +64,9 @@ screensaving, also known as "presentation mode".
 	Threshold to be used when scrolling.

 *start-activated*: ++
-	typeof: bool ++
-	default: *false* ++
-	Whether the inhibit should be activated when starting waybar.
+  typeof: bool ++
+  default: *false* ++
+  Whether the inhibit should be activated when starting waybar.

 *timeout*: ++
 	typeof: double ++
@ -97,8 +97,8 @@ screensaving, also known as "presentation mode".
 "idle_inhibitor": {
 	"format": "{icon}",
 	"format-icons": {
-		"activated": "",
-		"deactivated": ""
+	    "activated": "",
+	    "deactivated": ""
 	},
 	"timeout": 30.5
 }
--- a/man/waybar-image.5.scd
+++ b/man/waybar-image.5.scd
@ -1,4 +1,4 @@
-waybar-image(5)
+waybar-custom(5)

 # NAME

@ -10,29 +10,26 @@ The *image* module displays an image from a path.

 # CONFIGURATION

+Addressed by *custom/<name>*
+
 *path*: ++
 	typeof: string ++
 	The path to the image.

-*exec*: ++
-	typeof: string ++
-	The path to the script, which should return image path file. ++
-	It will only execute if the path is not set
-
 *size*: ++
 	typeof: integer ++
 	The width/height to render the image.

 *interval*: ++
 	typeof: integer ++
-	The interval (in seconds) to re-render the image. ++
-	This is useful if the contents of *path* changes. ++
+	The interval (in seconds) to re-render the image.
+	This is useful if the contents of *path* changes.
 	If no *interval* is defined, the image will only be rendered once.

 *signal*: ++
 	typeof: integer ++
-	The signal number used to update the module. ++
-	This can be used instead of *interval* if the file changes irregularly. ++
+	The signal number used to update the module.
+	This can be used instead of *interval* if the file changes irregularly.
 	The number is valid between 1 and N, where *SIGRTMIN+N* = *SIGRTMAX*.

 *on-click*: ++
@ -59,31 +56,17 @@ The *image* module displays an image from a path.
 	typeof: double ++
 	Threshold to be used when scrolling.

-*tooltip*: ++
-	typeof: bool ++
-	default: true ++
-	Option to enable tooltip on hover.
-
-# SCRIPT OUTPUT
-
-Similar to the *custom* module, output values of the script is *newline* separated.
-The following is the output format:
-
-```
-$path\\n$tooltip
-```
-
 # EXAMPLES

+## Spotify:
+
+## mpd:
+
 ```
-"image#album-art": {
+"image/album-art": {
 	"path": "/tmp/mpd_art",
 	"size": 32,
 	"interval": 5,
 	"on-click": "mpc toggle"
 }
-```
-
-# STYLE
-
- *#image*
+```
--- a/man/waybar-inhibitor.5.scd
+++ b/man/waybar-inhibitor.5.scd
@ -85,8 +85,8 @@ See *systemd-inhibit*(1) for more information.
 	"what": "handle-lid-switch",
 	"format": "{icon}",
 	"format-icons": {
-		"activated": "",
-		"deactivated": ""
+	    "activated": "",
+	    "deactivated": ""
 	}
 }
 ```
--- a/man/waybar-jack.5.scd
+++ b/man/waybar-jack.5.scd
@ -13,73 +13,73 @@ The *jack* module displays the current state of the JACK server.
 Addressed by *jack*

 *format*: ++
-	typeof: string ++
-	default: *{load}%* ++
-	The format, how information should be displayed. This format is used when other formats aren't specified.
+    typeof: string ++
+    default: *{load}%* ++
+    The format, how information should be displayed. This format is used when other formats aren't specified.

 *format-connected*: ++
-	typeof: string ++
-	This format is used when the module is connected to the JACK server.
+    typeof: string ++
+    This format is used when the module is connected to the JACK server.

 *format-disconnected*: ++
-	typeof: string ++
-	This format is used when the module is not connected to the JACK server.
+    typeof: string ++
+    This format is used when the module is not connected to the JACK server.

 *format-xrun*: ++
-	typeof: string ++
-	This format is used for one polling interval, when the JACK server reports an xrun.
+    typeof: string ++
+    This format is used for one polling interval, when the JACK server reports an xrun.

 *realtime*: ++
-	typeof: bool ++
-	default: *true* ++
-	Option to drop real-time privileges for the JACK client opened by Waybar.
+    typeof: bool ++
+    default: *true* ++
+    Option to drop real-time privileges for the JACK client opened by Waybar.

 *tooltip*: ++
-	typeof: bool ++
-	default: *true* ++
-	Option to disable tooltip on hover.
+    typeof: bool ++
+    default: *true* ++
+    Option to disable tooltip on hover.

 *tooltip-format*: ++
-	typeof: string ++
-	default: *{bufsize}/{samplerate} {latency}ms* ++
-	The format of information displayed in the tooltip.
+    typeof: string ++
+    default: *{bufsize}/{samplerate} {latency}ms* ++
+    The format of information displayed in the tooltip.

 *interval*: ++
-	typeof: integer ++
-	default: 1 ++
-	The interval in which the information gets polled.
+    typeof: integer ++
+    default: 1 ++
+    The interval in which the information gets polled.

 *rotate*: ++
-	typeof: integer ++
-	Positive value to rotate the text label.
+    typeof: integer ++
+    Positive value to rotate the text label.

 *max-length*: ++
-	typeof: integer ++
-	The maximum length in character the module should display.
+    typeof: integer ++
+    The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
-	typeof: string ++
-	Command to execute when clicked on the module.
+    typeof: string ++
+    Command to execute when clicked on the module.

 *on-click-middle*: ++
-	typeof: string ++
-	Command to execute when middle-clicked on the module using mousewheel.
+    typeof: string ++
+    Command to execute when middle-clicked on the module using mousewheel.

 *on-click-right*: ++
-	typeof: string ++
-	Command to execute when you right clicked on the module.
+    typeof: string ++
+    Command to execute when you right clicked on the module.

 *on-update*: ++
-	typeof: string ++
-	Command to execute when the module is updated.
+    typeof: string ++
+    Command to execute when the module is updated.

 # FORMAT REPLACEMENTS

@ -97,10 +97,10 @@ Addressed by *jack*

 ```
 "jack": {
-	"format": "DSP {}%",
-	"format-xrun": "{xruns} xruns",
-	"format-disconnected": "DSP off",
-	"realtime": true
+    "format": "DSP {}%",
+    "format-xrun": "{xruns} xruns",
+    "format-disconnected": "DSP off",
+    "realtime": true
 }
 ```

--- a/man/waybar-keyboard-state.5.scd
+++ b/man/waybar-keyboard-state.5.scd
@ -48,11 +48,6 @@ You must be a member of the input group to use this module.
 	default: chooses first valid input device ++
 	Which libevdev input device to show the state of. Libevdev devices can be found in /dev/input. The device should support number lock, caps lock, and scroll lock events.

-*binding-keys*: ++
-	typeof: array ++
-	default: [58, 69, 70] ++
-	Customize the key to trigger this module, the key number can be find in /usr/include/linux/input-event-codes.h or running sudo libinput debug-events --show-keycodes.
-
 # FORMAT REPLACEMENTS

 *{name}*: Caps, Num, or Scroll.
@ -70,13 +65,13 @@ The following *format-icons* can be set.

 ```
 "keyboard-state": {
-	"numlock": true,
-	"capslock": true,
-	"format": "{name} {icon}",
-	"format-icons": {
-		"locked": "",
-		"unlocked": ""
-	}
+    "numlock": true,
+    "capslock": true,
+    "format": "{name} {icon}",
+    "format-icons": {
+        "locked": "",
+        "unlocked": ""
+    }
 }
 ```

--- a/man/waybar-memory.5.scd
+++ b/man/waybar-memory.5.scd
@ -40,12 +40,12 @@ Addressed by *memory*
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
 	typeof: string ++
--- a/man/waybar-mpd.5.scd
+++ b/man/waybar-mpd.5.scd
@ -74,20 +74,20 @@ Addressed by *mpd*
 	Tooltip information displayed when the MPD server can't be reached.

 *artist-len*: ++
-	typeof: integer ++
-	Maximum length of the Artist tag.
+    typeof: integer ++
+    Maximum length of the Artist tag.

 *album-len*: ++
-	typeof: integer ++
-	Maximum length of the Album tag.
+    typeof: integer ++
+    Maximum length of the Album tag.

 *album-artist-len*: ++
-	typeof: integer ++
-	Maximum length of the Album Artist tag.
+    typeof: integer ++
+    Maximum length of the Album Artist tag.

 *title-len*: ++
-	typeof: integer ++
-	Maximum length of the Title tag.
+    typeof: integer ++
+    Maximum length of the Title tag.

 *rotate*: ++
 	typeof: integer ++
@ -98,12 +98,12 @@ Addressed by *mpd*
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
 	typeof: string ++
--- a/man/waybar-mpris.5.scd
+++ b/man/waybar-mpris.5.scd
@ -13,7 +13,8 @@ The *mpris* module displays currently playing media via libplayerctl.
 *player*: ++
 	typeof: string ++
 	default: playerctld ++
-	Name of the MPRIS player to attach to. Using the default value always follows the currenly active player.
+	Name of the MPRIS player to attach to. Using the default value always
+	follows the currenly active player.

 *ignored-players*: ++
 	typeof: []string ++
@ -32,95 +33,6 @@ The *mpris* module displays currently playing media via libplayerctl.
 	typeof: string ++
 	The status-specific text format.

-*tooltip*: ++
-	typeof: bool ++
-	default: true ++
-	Option to disable tooltip on hover.
-
-*tooltip-format*: ++
-	typeof: string ++
-	default: {player} ({status}) {dynamic} ++
-	The tooltip text format.
-
-*tooltip-format-[status]*: ++
-	typeof: string ++
-	The status-specific tooltip format.
-
-*artist-len*: ++
-	typeof: integer ++
-	Maximum length of the Artist tag (Wide/Fullwidth Unicode characters count as two). Set to zero to hide the artist in `{dynamic}` tag.
-
-*album-len*: ++
-	typeof: integer ++
-	Maximum length of the Album tag (Wide/Fullwidth Unicode characters count as two). Set to zero to hide the album in `{dynamic}` tag.
-
-*title-len*: ++
-	typeof: integer ++
-	Maximum length of the Title tag (Wide/Fullwidth Unicode characters count as two). Set to zero to hide the title in `{dynamic}` tag.
-
-*dynamic-len*: ++
-	typeof: integer ++
-	Maximum length of the Dynamic tag (Wide/Fullwidth Unicode characters ++
-	count as two). The dynamic tag will not truncate any tags beyond their ++
-	set length limits, instead, it will attempt to fit as much of the ++
-	available tags as possible. It is recommended you set title-len to ++
-	something less than or equal to this value, so the title will always be ++
-	displayed.
-
-*dynamic-order*: ++
-	typeof: []string ++
-	default: ["title", "artist", "album", "position", "length"] ++
-	Order of the tags shown by Dynamic tag. The position and length tags ++
-	will always be combined in the format [{position}/{length}]. The order ++
-	of these tags in relation to other tags will be determined based on the ++
-	declaration of the first among the two tags. Absence in this list means ++
-	force exclusion.
-
-*dynamic-importance-order*: ++
-	typeof: []string ++
-	default: ["title", "artist", "album", "position", "length"] ++
-	Priority of the tags when truncating the Dynamic tag. The final ones ++
-	will be the first to be truncated. Absence in this list means force ++
-	inclusion.
-
-*dynamic-separator*: ++
-	typeof: string ++
-	default: " - " ++
-	These characters will be used to separate two different tags, except ++
-	when one of these tags is position and length.
-
-*truncate-hours*: ++
-	typeof: bool ++
-	default: true ++
-	Whether to hide hours when media duration is less than an hour long.
-
-*enable-tooltip-len-limits*: ++
-	typeof: bool ++
-	default: false ++
-	Option to enable the length limits for the tooltip as well. By default the tooltip ignores all length limits.
-
-*ellipsis*: ++
-	typeof: string ++
-	default: "…" ++
-	This character will be used when any of the tags exceed their maximum length. If you don't want to use an ellipsis, set this to empty string.
-
-*rotate*: ++
-	typeof: integer ++
-	Positive value to rotate the text label.
-
-*max-length*: ++
-	typeof: integer ++
-	The maximum length in character the module should display.
-
-*min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
-
-*align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. ++
-	If the module is rotated, it will follow the flow of the text.
-
 *on-click*: ++
 	typeof: string ++
 	default: play-pause ++
@ -137,12 +49,13 @@ The *mpris* module displays currently playing media via libplayerctl.
 	Overwrite default action toggles.

 *player-icons*: ++
-	typeof: map[string]string ++
+	typeof: map[string]string
 	Allows setting _{player-icon}_ based on player-name property.

 *status-icons*: ++
-	typeof: map[string]string ++
-	Allows setting _{status-icon}_ based on player status (playing, paused, stopped).
+	typeof: map[string]string
+	Allows setting _{status-icon}_ based on player status (playing, paused,
+	stopped).


 # FORMAT REPLACEMENTS
@ -160,18 +73,18 @@ The *mpris* module displays currently playing media via libplayerctl.
 *{length}*: Length of the track, formatted as HH:MM:SS

 *{dynamic}*: Use _{artist}_, _{album}_, _{title}_ and _{length}_, automatically omit++
-	empty values
+           empty values

-*{player_icon}*: Chooses an icon from _player-icons_ based on _{player}_
+*{player-icon}*: Chooses an icon from _player-icons_ based on _{player}_

-*{status_icon}*: Chooses an icon from _status-icons_ based on _{status}_
+*{status-icon}*: Chooses an icon from _status-icons_ based on _{status}_

 # EXAMPLES

 ```
 "mpris": {
-	"format": "{player_icon} {dynamic}",
-	"format-paused": "{status_icon} <i>{dynamic}</i>",
+	"format": "DEFAULT: {player_icon} {dynamic}",
+	"format-paused": "DEFAULT: {status_icon} <i>{dynamic}</i>",
 	"player-icons": {
 		"default": "▶",
 		"mpv": "🎵"
--- a/man/waybar-network.5.scd
+++ b/man/waybar-network.5.scd
@ -65,12 +65,12 @@ Addressed by *network*
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
 	typeof: string ++
--- a/man/waybar-pulseaudio.5.scd
+++ b/man/waybar-pulseaudio.5.scd
@ -51,12 +51,12 @@ Additionally you can control the volume by scrolling *up* or *down* while the cu
 	The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *scroll-step*: ++
 	typeof: float ++
@ -91,10 +91,6 @@ Additionally you can control the volume by scrolling *up* or *down* while the cu
 	typeof: double ++
 	Threshold to be used when scrolling.

-*reverse-scrolling*: ++
-	typeof: bool ++
-	Option to reverse the scroll direction.
-
 *tooltip*: ++
 	typeof: bool ++
 	default: true ++
--- a/man/waybar-river-layout.5.scd
+++ b/man/waybar-river-layout.5.scd
@ -1,67 +0,0 @@
-waybar-river-layout(5)
-
-# NAME
-
-waybar - river layout module
-
-# DESCRIPTION
-
-The *layout* module displays the current layout in river.
-
-It may not be set until a layout is first applied.
-
-# CONFIGURATION
-
-Addressed by *river/layout*
-
-*format*: ++
-	typeof: string ++
-	default: {} ++
-	The format, how information should be displayed. On {} data gets inserted.
-
-*rotate*: ++
-	typeof: integer ++
-	Positive value to rotate the text label.
-
-*max-length*: ++
-	typeof: integer ++
-	The maximum length in character the module should display.
-
-*min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
-
-*align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
-
-*on-click*: ++
-	typeof: string ++
-	Command to execute when clicked on the module.
-
-*on-click-middle*: ++
-	typeof: string ++
-	Command to execute when middle-clicked on the module using mousewheel.
-
-*on-click-right*: ++
-	typeof: string ++
-	Command to execute when you right clicked on the module.
-
-# EXAMPLE
-
-```
-"river/layout": {
-	"format": "{}",
-	"min-length": 4,
-	"align": "right"
-}
-```
-
-# STYLE
-
- *#layout*
- *#layout.focused* Applied when the output this module's bar belongs to is focused.
-
-# SEE ALSO
-
-waybar(5), river(1)
--- a/man/waybar-river-mode.5.scd
+++ b/man/waybar-river-mode.5.scd
@ -13,59 +13,59 @@ The *mode* module displays the current mapping mode of river.
 Addressed by *river/mode*

 *format*: ++
-	typeof: string  ++
-	default: {} ++
-	The format, how information should be displayed. On {} data gets inserted.
+    typeof: string  ++
+    default: {} ++
+    The format, how information should be displayed. On {} data gets inserted.

 *rotate*: ++
-	typeof: integer ++
-	Positive value to rotate the text label.
+    typeof: integer ++
+    Positive value to rotate the text label.

 *max-length*: ++
-	typeof: integer ++
-	The maximum length in character the module should display.
+    typeof: integer ++
+    The maximum length in character the module should display.

 *min-length*: ++
-	typeof: integer ++
-	The minimum length in characters the module should take up.
+    typeof: integer ++
+    The minimum length in characters the module should take up.

 *align*: ++
-	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+    typeof: float ++
+    The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.

 *on-click*: ++
-	typeof: string ++
-	Command to execute when clicked on the module.
+    typeof: string ++
+    Command to execute when clicked on the module.

 *on-click-middle*: ++
-	typeof: string ++
-	Command to execute when middle-clicked on the module using mousewheel.
+    typeof: string ++
+    Command to execute when middle-clicked on the module using mousewheel.

 *on-click-right*: ++
-	typeof: string ++
-	Command to execute when you right clicked on the module.
+    typeof: string ++
+    Command to execute when you right clicked on the module.

 *on-update*: ++
-	typeof: string ++
-	Command to execute when the module is updated.
+    typeof: string ++
+    Command to execute when the module is updated.

 *on-scroll-up*: ++
-	typeof: string ++
-	Command to execute when scrolling up on the module.
+    typeof: string ++
+    Command to execute when scrolling up on the module.

 *on-scroll-down*: ++
-	typeof: string ++
-	Command to execute when scrolling down on the module.
+    typeof: string ++
+    Command to execute when scrolling down on the module.

 *smooth-scrolling-threshold*: ++
-	typeof: double ++
-	Threshold to be used when scrolling.
+    typeof: double ++
+    Threshold to be used when scrolling.

 # EXAMPLES

 ```
 "river/mode": {
-	"format": " {}"
+    "format": " {}"
 }
 ```

--- a/man/waybar-river-tags.5.scd
+++ b/man/waybar-river-tags.5.scd
@ -13,24 +13,24 @@ The *tags* module displays the current state of tags in river.
 Addressed by *river/tags*

 *num-tags*: ++
-	typeof: uint ++
-	default: 9 ++
-	The number of tags that should be displayed. Max 32.
+    typeof: uint ++
+    default: 9 ++
+    The number of tags that should be displayed. Max 32.

 *tag-labels*: ++
-	typeof: array ++
-	The label to display for each tag.
+    typeof: array ++
+    The label to display for each tag.

 *disable-click*: ++
-	typeof: bool ++
-	default: false ++
-	If set to false, you can left click to set focused tag. Right click to toggle tag focus. If set to true this behaviour is disabled.
+   typeof: bool ++
+   default: false ++
+   If set to false, you can left click to set focused tag. Right click to toggle tag focus. If set to true this behaviour is disabled.

 # EXAMPLE

 ```
 "river/tags": {
-	"num-tags": 5
+    "num-tags": 5
 }
 ```

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