From c6d85b2b9209dbe853f67b3613ee9a01d2850627 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Sun, 20 Nov 2016 23:04:31 +0100
Subject: [PATCH] refactor: Optimize build

---
 cmake/build/core.cmake                        |  23 +-
 cmake/build/summary.cmake                     |  93 +--
 include/adapters/alsa.hpp                     |   6 +-
 include/adapters/mpd.hpp                      |  13 +-
 include/adapters/net.hpp                      |   3 +
 include/common.hpp                            |  69 +--
 include/components/bar.hpp                    |  37 +-
 include/components/config.hpp                 |  10 +-
 include/components/controller.hpp             |  27 +-
 include/components/eventloop.hpp              |   5 +-
 include/components/ipc.hpp                    |   2 +
 include/components/logger.hpp                 |   4 +-
 include/components/parser.hpp                 |   1 -
 include/components/signals.hpp                |  14 +-
 include/config.hpp.cmake                      |  40 +-
 include/debug.hpp                             |   1 +
 include/drawtypes/animation.hpp               |   4 +
 include/modules/backlight.hpp                 |   2 +-
 include/modules/battery.hpp                   |   4 +-
 include/modules/bspwm.hpp                     |   2 +-
 include/modules/counter.hpp                   |   2 +-
 include/modules/cpu.hpp                       |   2 +-
 include/modules/date.hpp                      |   2 +-
 include/modules/fs.hpp                        |   2 +-
 include/modules/i3.hpp                        |   2 +-
 include/modules/ipc.hpp                       |   2 +-
 include/modules/memory.hpp                    |   2 +-
 include/modules/menu.hpp                      |   2 +-
 include/modules/meta.hpp                      | 558 ------------------
 include/modules/meta/base.hpp                 | 171 ++++++
 include/modules/meta/base.inl                 | 185 ++++++
 include/modules/meta/event_module.hpp         |  23 +
 include/modules/meta/event_module.inl         |  51 ++
 include/modules/meta/inotify_module.hpp       |  27 +
 include/modules/meta/inotify_module.inl       |  96 +++
 include/modules/meta/static_module.hpp        |  21 +
 include/modules/meta/static_module.inl        |  15 +
 include/modules/meta/timer_module.hpp         |  28 +
 include/modules/meta/timer_module.inl         |  35 ++
 include/modules/mpd.hpp                       |   7 +-
 include/modules/network.hpp                   |   2 +-
 include/modules/script.hpp                    |   8 +-
 include/modules/temperature.hpp               |   2 +-
 include/modules/text.hpp                      |   2 +-
 include/modules/unsupported.hpp               |   3 +-
 include/modules/volume.hpp                    |  10 +-
 include/modules/xbacklight.hpp                |  10 +-
 include/modules/xwindow.hpp                   |   6 +-
 include/utils/command.hpp                     |   5 +-
 .../utils/{threading.hpp => concurrency.hpp}  |  13 +-
 include/utils/env.hpp                         |  12 +
 include/utils/factory.hpp                     |  25 +
 include/utils/functional.hpp                  |  12 +
 include/utils/scope.hpp                       |   2 +
 include/utils/throttle.hpp                    |   3 +
 include/utils/time.hpp                        |  23 +
 include/x11/connection.hpp                    |  24 +-
 include/x11/damage.hpp                        |   9 +
 include/x11/events.hpp                        |  61 ++
 include/x11/{fontmanager.hpp => fonts.hpp}    |  29 +-
 include/x11/icccm.hpp                         |   1 -
 include/x11/randr.hpp                         |  25 +-
 include/x11/render.hpp                        |   9 +
 include/x11/tray.hpp                          |   7 +-
 include/x11/types.hpp                         | 111 +---
 include/x11/window.hpp                        | 129 ----
 include/x11/winspec.hpp                       | 151 +++++
 include/x11/wm.hpp                            |   5 +-
 include/x11/xresources.hpp                    |  11 +-
 src/CMakeLists.txt                            | 113 ++--
 src/adapters/alsa.cpp                         |  26 +-
 src/adapters/mpd.cpp                          |  12 +-
 src/components/bar.cpp                        |  42 +-
 src/components/command_line.cpp               |   1 +
 src/components/config.cpp                     |  12 +-
 src/components/controller.cpp                 |  26 +-
 src/components/eventloop.cpp                  |   7 +-
 src/components/ipc.cpp                        |   1 +
 src/components/logger.cpp                     |   2 +
 src/components/parser.cpp                     |   3 +
 src/components/signals.cpp                    |  31 +-
 src/drawtypes/progressbar.cpp                 |   3 +
 src/main.cpp                                  |  15 +-
 src/modules/backlight.cpp                     |   7 +
 src/modules/battery.cpp                       |  10 +-
 src/modules/bspwm.cpp                         |   6 +
 src/modules/counter.cpp                       |   6 +
 src/modules/cpu.cpp                           |   7 +
 src/modules/date.cpp                          |   6 +
 src/modules/fs.cpp                            |   9 +-
 src/modules/i3.cpp                            |   6 +
 src/modules/ipc.cpp                           |   7 +
 src/modules/memory.cpp                        |   7 +
 src/modules/menu.cpp                          |   6 +
 src/modules/meta/base.cpp                     |  97 +++
 src/modules/meta/inotify_module.cpp           | 104 ++++
 src/modules/mpd.cpp                           |   6 +
 src/modules/network.cpp                       |  10 +-
 src/modules/script.cpp                        |   8 +-
 src/modules/temperature.cpp                   |   6 +
 src/modules/text.cpp                          |   6 +
 src/modules/volume.cpp                        |  39 +-
 src/modules/xbacklight.cpp                    |  15 +-
 src/modules/xwindow.cpp                       |   8 +-
 src/utils/bspwm.cpp                           |   3 +-
 src/utils/command.cpp                         |   8 +-
 src/utils/env.cpp                             |  18 +
 src/utils/inotify.cpp                         |   2 +
 src/utils/process.cpp                         |   1 +
 src/utils/socket.cpp                          |   5 +-
 src/utils/throttle.cpp                        |   4 +-
 src/x11/connection.cpp                        |  24 +-
 src/x11/{fontmanager.cpp => fonts.cpp}        |  64 +-
 src/x11/randr.cpp                             |  14 +
 src/x11/tray.cpp                              |  11 +-
 src/x11/window.cpp                            |   1 +
 src/x11/wm.cpp                                |   1 +
 src/x11/xresources.cpp                        |  24 +
 tests/CMakeLists.txt                          |  18 +-
 tests/unit_tests/components/command_line.cpp  |   4 +-
 tests/unit_tests/components/di.cpp            |   6 +-
 tests/unit_tests/components/logger.cpp        |  13 -
 tests/unit_tests/utils/string.cpp             |   2 +-
 tests/unit_tests/x11/color.cpp                |  31 +-
 tests/unit_tests/x11/connection.cpp           |   8 +-
 tests/unit_tests/x11/window.cpp               |  25 -
 tests/unit_tests/x11/winspec.cpp              |  33 ++
 127 files changed, 1962 insertions(+), 1331 deletions(-)
 delete mode 100644 include/modules/meta.hpp
 create mode 100644 include/modules/meta/base.hpp
 create mode 100644 include/modules/meta/base.inl
 create mode 100644 include/modules/meta/event_module.hpp
 create mode 100644 include/modules/meta/event_module.inl
 create mode 100644 include/modules/meta/inotify_module.hpp
 create mode 100644 include/modules/meta/inotify_module.inl
 create mode 100644 include/modules/meta/static_module.hpp
 create mode 100644 include/modules/meta/static_module.inl
 create mode 100644 include/modules/meta/timer_module.hpp
 create mode 100644 include/modules/meta/timer_module.inl
 rename include/utils/{threading.hpp => concurrency.hpp} (82%)
 create mode 100644 include/utils/env.hpp
 create mode 100644 include/utils/factory.hpp
 create mode 100644 include/utils/functional.hpp
 create mode 100644 include/utils/time.hpp
 create mode 100644 include/x11/damage.hpp
 create mode 100644 include/x11/events.hpp
 rename include/x11/{fontmanager.hpp => fonts.hpp} (69%)
 create mode 100644 include/x11/render.hpp
 create mode 100644 include/x11/winspec.hpp
 create mode 100644 src/modules/meta/base.cpp
 create mode 100644 src/modules/meta/inotify_module.cpp
 create mode 100644 src/utils/env.cpp
 rename src/x11/{fontmanager.cpp => fonts.cpp} (71%)
 delete mode 100644 tests/unit_tests/components/logger.cpp
 delete mode 100644 tests/unit_tests/x11/window.cpp
 create mode 100644 tests/unit_tests/x11/winspec.cpp

diff --git a/cmake/build/core.cmake b/cmake/build/core.cmake
index 23e012fe..76a6cb3d 100644
--- a/cmake/build/core.cmake
+++ b/cmake/build/core.cmake
@@ -1,7 +1,6 @@
 #
 # Core setup
 #
-
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -15,25 +14,27 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-# Generic compiler flags
+# Compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-
-# Debug specific compiler flags
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-stack-protector")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g2")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pedantic")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pedantic-errors")
 
-# Release specific compiler flags
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
+# Linker flags
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s")
 
-# Compiler specific flags
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL Clang)
+# Check compiler
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
   message_colored(STATUS "Using supported compiler ${CMAKE_CXX_COMPILER_ID}" 32)
-elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL GNU)
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
   message_colored(STATUS "Using supported compiler ${CMAKE_CXX_COMPILER_ID}" 32)
 else()
   message_colored(WARNING "Using unsupported compiler ${CMAKE_CXX_COMPILER_ID} !" 31)
diff --git a/cmake/build/summary.cmake b/cmake/build/summary.cmake
index 3d455f72..da8cd7da 100644
--- a/cmake/build/summary.cmake
+++ b/cmake/build/summary.cmake
@@ -2,14 +2,23 @@
 # Output build summary
 #
 
-message(STATUS "---------------------------")
-message(STATUS " Build type: ${CMAKE_BUILD_TYPE}")
+function(colored_option message_level text var color_on color_off)
+  string(ASCII 27 esc)
+  if(${var})
+    message(${message_level} "${esc}[${color_on}m${text}${esc}[0m")
+  else()
+    message(${message_level} "${esc}[${color_off}m${text}${esc}[0m")
+  endif()
+endfunction()
+
+message(STATUS "--------------------------")
+message_colored(STATUS " Build type: ${CMAKE_BUILD_TYPE}" "32;1")
 message(STATUS " Compiler C: ${CMAKE_C_COMPILER}")
 message(STATUS " Compiler C++: ${CMAKE_CXX_COMPILER}")
 message(STATUS " Compiler flags: ${CMAKE_CXX_FLAGS}")
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  message(STATUS " + debug flags:: ${CMAKE_CXX_FLAGS_DEBUG}")
+  message(STATUS "   debug flags: ${CMAKE_CXX_FLAGS_DEBUG}")
   if(NOT DEFINED ${DEBUG_LOGGER})
     set(DEBUG_LOGGER ON)
   endif()
@@ -17,50 +26,52 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(ENABLE_CCACHE ON)
   endif()
 elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
-  message(STATUS " + release flags:: ${CMAKE_CXX_FLAGS_RELEASE}")
+  message(STATUS "   release: ${CMAKE_CXX_FLAGS_RELEASE}")
 elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-  message(STATUS " + minsizerel flags:: ${CMAKE_CXX_FLAGS_MINSIZEREL}")
+  message(STATUS "   minsizerel: ${CMAKE_CXX_FLAGS_MINSIZEREL}")
 elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-  message(STATUS " + relwithdebinfo flags:: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+  message(STATUS "   relwithdebinfo: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 endif()
 
+message(STATUS " Linker flags: ${CMAKE_EXE_LINKER_FLAGS}")
+
 if(CXXLIB_CLANG)
-  message(STATUS " Linking C++ library: libc++")
+  message(STATUS " C++ library: libc++")
 elseif(CXXLIB_GCC)
-  message(STATUS " Linking C++ library: libstdc++")
+  message(STATUS " C++ library: libstdc++")
 else()
-  message(STATUS " Linking C++ library: system default")
+  message(STATUS " C++ library: system default")
 endif()
 
-message(STATUS "--------------------------------------------")
-message(STATUS " Build testsuite            ${BUILD_TESTS}")
-message(STATUS " Enable debug logger        ${DEBUG_LOGGER}")
-message(STATUS " Enable extra tracing       ${VERBOSE_TRACELOG}")
-message(STATUS " Enable ccache support      ${ENABLE_CCACHE}")
-message(STATUS "--------------------------------------------")
-message(STATUS " Enable alsa support        ${ENABLE_ALSA}")
-message(STATUS " Enable i3 support          ${ENABLE_I3}")
-message(STATUS " Enable mpd support         ${ENABLE_MPD}")
-message(STATUS " Enable network support     ${ENABLE_NETWORK}")
-message(STATUS "--------------------------------------------")
-message(STATUS " Enable X RandR             ${ENABLE_RANDR_EXT}")
-message(STATUS " Enable X Render            ${ENABLE_RENDER_EXT}")
-message(STATUS " Enable X Damage            ${ENABLE_DAMAGE_EXT}")
-message(STATUS "--------------------------------------------")
-message(STATUS " ALSA_SOUNDCARD             ${SETTING_ALSA_SOUNDCARD}")
-message(STATUS " BSPWM_SOCKET_PATH          ${SETTING_BSPWM_SOCKET_PATH}")
-message(STATUS " BSPWM_STATUS_PREFIX        ${SETTING_BSPWM_STATUS_PREFIX}")
-message(STATUS " CONNECTION_TEST_IP         ${SETTING_CONNECTION_TEST_IP}")
-message(STATUS " PATH_ADAPTER_STATUS        ${SETTING_PATH_ADAPTER_STATUS}")
-message(STATUS " PATH_BACKLIGHT_VAL         ${SETTING_PATH_BACKLIGHT_VAL}")
-message(STATUS " PATH_BACKLIGHT_MAX         ${SETTING_PATH_BACKLIGHT_MAX}")
-message(STATUS " PATH_BATTERY_CAPACITY      ${SETTING_PATH_BATTERY_CAPACITY}")
-message(STATUS " PATH_BATTERY_CAPACITY_MAX  ${SETTING_PATH_BATTERY_CAPACITY_MAX}")
-message(STATUS " PATH_BATTERY_CAPACITY_PERC ${SETTING_PATH_BATTERY_CAPACITY_PERC}")
-message(STATUS " PATH_BATTERY_VOLTAGE       ${SETTING_PATH_BATTERY_VOLTAGE}")
-message(STATUS " PATH_BATTERY_RATE          ${SETTING_PATH_BATTERY_RATE}")
-message(STATUS " PATH_CPU_INFO              ${SETTING_PATH_CPU_INFO}")
-message(STATUS " PATH_MEMORY_INFO           ${SETTING_PATH_MEMORY_INFO}")
-message(STATUS " PATH_MESSAGING_FIFO        ${SETTING_PATH_MESSAGING_FIFO}")
-message(STATUS " PATH_TEMPERATURE_INFO      ${SETTING_PATH_TEMPERATURE_INFO}")
-message(STATUS "--------------------------------------------")
+message(STATUS "--------------------------")
+colored_option(STATUS " Build testsuite      ${BUILD_TESTS}" BUILD_TESTS "32;1" "37;2")
+colored_option(STATUS " Debug logging        ${DEBUG_LOGGER}" DEBUG_LOGGER "32;1" "37;2")
+colored_option(STATUS " Verbose tracing      ${VERBOSE_TRACELOG}" VERBOSE_TRACELOG "32;1" "37;2")
+colored_option(STATUS " Enable ccache        ${ENABLE_CCACHE}" ENABLE_CCACHE "32;1" "37;2")
+message(STATUS "--------------------------")
+colored_option(STATUS " Enable alsa          ${ENABLE_ALSA}" ENABLE_ALSA "32;1" "37;2")
+colored_option(STATUS " Enable i3            ${ENABLE_I3}" ENABLE_I3 "32;1" "37;2")
+colored_option(STATUS " Enable mpd           ${ENABLE_MPD}" ENABLE_MPD "32;1" "37;2")
+colored_option(STATUS " Enable network       ${ENABLE_NETWORK}" ENABLE_NETWORK "32;1" "37;2")
+message(STATUS "--------------------------")
+colored_option(STATUS " Enable X RandR       ${ENABLE_RANDR_EXT}" ENABLE_RANDR_EXT "32;1" "37;2")
+colored_option(STATUS " Enable X Render      ${ENABLE_RENDER_EXT}" ENABLE_RENDER_EXT "32;1" "37;2")
+colored_option(STATUS " Enable X Damage      ${ENABLE_DAMAGE_EXT}" ENABLE_DAMAGE_EXT "32;1" "37;2")
+message(STATUS "--------------------------")
+# message(STATUS " ALSA_SOUNDCARD             ${SETTING_ALSA_SOUNDCARD}")
+# message(STATUS " BSPWM_SOCKET_PATH          ${SETTING_BSPWM_SOCKET_PATH}")
+# message(STATUS " BSPWM_STATUS_PREFIX        ${SETTING_BSPWM_STATUS_PREFIX}")
+# message(STATUS " CONNECTION_TEST_IP         ${SETTING_CONNECTION_TEST_IP}")
+# message(STATUS " PATH_ADAPTER_STATUS        ${SETTING_PATH_ADAPTER_STATUS}")
+# message(STATUS " PATH_BACKLIGHT_VAL         ${SETTING_PATH_BACKLIGHT_VAL}")
+# message(STATUS " PATH_BACKLIGHT_MAX         ${SETTING_PATH_BACKLIGHT_MAX}")
+# message(STATUS " PATH_BATTERY_CAPACITY      ${SETTING_PATH_BATTERY_CAPACITY}")
+# message(STATUS " PATH_BATTERY_CAPACITY_MAX  ${SETTING_PATH_BATTERY_CAPACITY_MAX}")
+# message(STATUS " PATH_BATTERY_CAPACITY_PERC ${SETTING_PATH_BATTERY_CAPACITY_PERC}")
+# message(STATUS " PATH_BATTERY_VOLTAGE       ${SETTING_PATH_BATTERY_VOLTAGE}")
+# message(STATUS " PATH_BATTERY_RATE          ${SETTING_PATH_BATTERY_RATE}")
+# message(STATUS " PATH_CPU_INFO              ${SETTING_PATH_CPU_INFO}")
+# message(STATUS " PATH_MEMORY_INFO           ${SETTING_PATH_MEMORY_INFO}")
+# message(STATUS " PATH_MESSAGING_FIFO        ${SETTING_PATH_MESSAGING_FIFO}")
+# message(STATUS " PATH_TEMPERATURE_INFO      ${SETTING_PATH_TEMPERATURE_INFO}")
+# message(STATUS "--------------------------")
diff --git a/include/adapters/alsa.hpp b/include/adapters/alsa.hpp
index 02fc8c9a..01f8c230 100644
--- a/include/adapters/alsa.hpp
+++ b/include/adapters/alsa.hpp
@@ -9,7 +9,7 @@
 
 #include "common.hpp"
 #include "config.hpp"
-#include "utils/threading.hpp"
+#include "utils/concurrency.hpp"
 
 #define MAX_LINEAR_DB_SCALE 24
 
@@ -42,7 +42,7 @@ class alsa_ctl_interface {
  private:
   int m_numid = 0;
 
-  threading_util::spin_lock m_lock;
+  concurrency_util::spin_lock m_lock;
 
   snd_hctl_t* m_hctl = nullptr;
   snd_hctl_elem_t* m_elem = nullptr;
@@ -77,7 +77,7 @@ class alsa_mixer {
  private:
   string m_name;
 
-  threading_util::spin_lock m_lock;
+  concurrency_util::spin_lock m_lock;
 
   snd_mixer_t* m_hardwaremixer = nullptr;
   snd_mixer_elem_t* m_mixerelement = nullptr;
diff --git a/include/adapters/mpd.hpp b/include/adapters/mpd.hpp
index 0195a6cd..43b29f9a 100644
--- a/include/adapters/mpd.hpp
+++ b/include/adapters/mpd.hpp
@@ -3,14 +3,16 @@
 #include <mpd/client.h>
 #include <stdlib.h>
 #include <chrono>
-#include <memory>
-#include <string>
 
 #include "common.hpp"
-#include "components/logger.hpp"
 
 POLYBAR_NS
 
+// fwd
+class logger;
+
+namespace chrono = std::chrono;
+
 namespace mpd {
   DEFINE_ERROR(mpd_exception);
   DEFINE_CHILD_ERROR(client_error, mpd_exception);
@@ -72,9 +74,8 @@ namespace mpd {
   class mpdstatus;
   class mpdconnection {
    public:
-    explicit mpdconnection(const logger& logger, string host, unsigned int port = 6600,
-        string password = "", unsigned int timeout = 15)
-        : m_log(logger), m_host(host), m_port(port), m_password(password), m_timeout(timeout) {}
+    explicit mpdconnection(
+        const logger& logger, string host, unsigned int port = 6600, string password = "", unsigned int timeout = 15);
 
     void connect();
     void disconnect();
diff --git a/include/adapters/net.hpp b/include/adapters/net.hpp
index a49d8a8e..d1ee8bbb 100644
--- a/include/adapters/net.hpp
+++ b/include/adapters/net.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <chrono>
 #include <arpa/inet.h>
 #include <ifaddrs.h>
 #include <iwlib.h>
@@ -13,6 +14,8 @@
 
 POLYBAR_NS
 
+namespace chrono = std::chrono;
+
 namespace net {
   DEFINE_ERROR(network_error);
 
diff --git a/include/common.hpp b/include/common.hpp
index d40762a3..98a5cb6d 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -4,18 +4,13 @@
 #define BOOST_DI_CFG_DIAGNOSTICS_LEVEL 2
 #endif
 
-#include <atomic>
 #include <boost/di.hpp>
-#include <boost/optional.hpp>
 #include <cassert>
 #include <cerrno>
-#include <chrono>
 #include <cstring>
-#include <functional>
 #include <map>
 #include <memory>
 #include <string>
-#include <thread>
 #include <vector>
 
 #include "config.hpp"
@@ -28,8 +23,19 @@
   }
 #define POLYBAR_NS_PATH "polybar::v2_0_0"
 
+#ifndef PIPE_READ
 #define PIPE_READ 0
+#endif
+#ifndef PIPE_WRITE
 #define PIPE_WRITE 1
+#endif
+
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO 1
+#endif
+#ifndef STDERR_FILENO
+#define STDERR_FILENO 2
+#endif
 
 #ifdef DEBUG
 #include "debug.hpp"
@@ -42,12 +48,8 @@ POLYBAR_NS
 //==================================================
 
 namespace di = boost::di;
-namespace chrono = std::chrono;
-namespace this_thread = std::this_thread;
 namespace placeholders = std::placeholders;
 
-using namespace std::chrono_literals;
-
 using std::string;
 using std::stringstream;
 using std::size_t;
@@ -66,36 +68,8 @@ using std::map;
 using std::vector;
 using std::to_string;
 using std::strerror;
-using std::getenv;
-using std::thread;
 using std::exception;
 
-using boost::optional;
-
-using stateflag = std::atomic<bool>;
-
-//==================================================
-// Instance factory
-//==================================================
-
-namespace factory {
-  template <class InstanceType, class... Deps>
-  unique_ptr<InstanceType> generic_instance(Deps... deps) {
-    return make_unique<InstanceType>(deps...);
-  }
-
-  template <class InstanceType, class... Deps>
-  shared_ptr<InstanceType> generic_singleton(Deps... deps) {
-    static auto instance = make_shared<InstanceType>(deps...);
-    return instance;
-  }
-}
-
-struct null_deleter {
-  template <typename T>
-  void operator()(T*) const {}
-};
-
 //==================================================
 // Errors and exceptions
 //==================================================
@@ -121,25 +95,4 @@ class system_error : public application_error {
   }
 #define DEFINE_ERROR(error) DEFINE_CHILD_ERROR(error, application_error)
 
-//==================================================
-// Various tools and helpers functions
-//==================================================
-
-auto has_env = [](const char* var) { return getenv(var) != nullptr; };
-auto read_env = [](const char* var, string&& fallback = "") {
-  const char* value{getenv(var)};
-  return value != nullptr ? value : fallback;
-};
-
-template <class T>
-auto time_execution(const T& expr) noexcept {
-  auto start = std::chrono::high_resolution_clock::now();
-  expr();
-  auto finish = std::chrono::high_resolution_clock::now();
-  return std::chrono::duration_cast<std::chrono::milliseconds>(finish - start).count();
-}
-
-template <typename... Args>
-using callback = function<void(Args...)>;
-
 POLYBAR_NS_END
diff --git a/include/components/bar.hpp b/include/components/bar.hpp
index 85465838..7f7e1136 100644
--- a/include/components/bar.hpp
+++ b/include/components/bar.hpp
@@ -4,11 +4,10 @@
 #include "components/config.hpp"
 #include "components/logger.hpp"
 #include "components/types.hpp"
-#include "utils/threading.hpp"
+#include "utils/concurrency.hpp"
 #include "utils/throttle.hpp"
 #include "x11/connection.hpp"
-#include "x11/fontmanager.hpp"
-#include "x11/tray.hpp"
+#include "x11/events.hpp"
 #include "x11/types.hpp"
 #include "x11/window.hpp"
 
@@ -16,17 +15,12 @@ POLYBAR_NS
 
 // fwd
 class tray_manager;
+class font_manager;
 
 class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::property_notify> {
  public:
-  explicit bar(connection& conn, const config& config, const logger& logger, unique_ptr<fontmanager> fontmanager,
-      unique_ptr<tray_manager> tray_manager)
-      : m_connection(conn)
-      , m_conf(config)
-      , m_log(logger)
-      , m_fontmanager(forward<decltype(fontmanager)>(fontmanager))
-      , m_tray(forward<decltype(tray_manager)>(tray_manager)) {}
-
+  explicit bar(connection& conn, const config& config, const logger& logger, unique_ptr<font_manager> font_manager,
+      unique_ptr<tray_manager> tray_manager);
   ~bar();
 
   void bootstrap(bool nodraw = false);
@@ -79,10 +73,10 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
   connection& m_connection;
   const config& m_conf;
   const logger& m_log;
-  unique_ptr<fontmanager> m_fontmanager;
+  unique_ptr<font_manager> m_fontmanager;
   unique_ptr<tray_manager> m_tray;
 
-  threading_util::spin_lock m_lock;
+  concurrency_util::spin_lock m_lock;
   throttle_util::throttle_t m_throttler;
 
   xcb_screen_t* m_screen;
@@ -115,21 +109,6 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
   XftDraw* m_xftdraw;
 };
 
-namespace {
-  /**
-   * Configure injection module
-   */
-  template <typename T = unique_ptr<bar>>
-  di::injector<T> configure_bar() {
-    // clang-format off
-    return di::make_injector(
-        configure_connection(),
-        configure_config(),
-        configure_logger(),
-        configure_fontmanager(),
-        configure_tray_manager());
-    // clang-format on
-  }
-}
+di::injector<unique_ptr<bar>> configure_bar();
 
 POLYBAR_NS_END
diff --git a/include/components/config.hpp b/include/components/config.hpp
index df296740..41696670 100644
--- a/include/components/config.hpp
+++ b/include/components/config.hpp
@@ -1,11 +1,13 @@
 #pragma once
 
+#include <boost/optional.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
 #include "common.hpp"
 #include "components/logger.hpp"
+#include "utils/env.hpp"
 #include "utils/string.hpp"
 #include "x11/xresources.hpp"
 
@@ -78,7 +80,7 @@ class config {
   template <typename T>
   vector<T> get_list(string section, string key) const {
     vector<T> vec;
-    optional<T> value;
+    boost::optional<T> value;
 
     while ((value = m_ptree.get_optional<T>(build_path(section, key) + "-" + to_string(vec.size()))) != boost::none) {
       auto str_val = m_ptree.get<string>(build_path(section, key) + "-" + to_string(vec.size()));
@@ -98,7 +100,7 @@ class config {
   template <typename T>
   vector<T> get_list(string section, string key, vector<T> default_value) const {
     vector<T> vec;
-    optional<T> value;
+    boost::optional<T> value;
 
     while ((value = m_ptree.get_optional<T>(build_path(section, key) + "-" + to_string(vec.size()))) != boost::none) {
       auto str_val = m_ptree.get<string>(build_path(section, key) + "-" + to_string(vec.size()));
@@ -173,8 +175,8 @@ class config {
       var.erase(pos);
     }
 
-    if (has_env(var.c_str()))
-      return boost::lexical_cast<T>(read_env(var.c_str()));
+    if (env_util::has(var.c_str()))
+      return boost::lexical_cast<T>(env_util::get(var.c_str()));
 
     return fallback;
   }
diff --git a/include/components/controller.hpp b/include/components/controller.hpp
index c3ba179d..96bf5f39 100644
--- a/include/components/controller.hpp
+++ b/include/components/controller.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common.hpp"
-#include "components/bar.hpp"
 #include "components/config.hpp"
 #include "components/eventloop.hpp"
 #include "components/ipc.hpp"
@@ -14,6 +13,14 @@
 
 POLYBAR_NS
 
+// fwd decl {{{
+
+class bar;
+
+// }}}
+
+using watch_t = inotify_util::watch_t;
+
 class controller {
  public:
   explicit controller(connection& conn, const logger& logger, const config& config, unique_ptr<eventloop> eventloop,
@@ -72,22 +79,6 @@ class controller {
   bool m_writeback{false};
 };
 
-namespace {
-  /**
-   * Configure injection module
-   */
-  template <typename T = unique_ptr<controller>>
-  di::injector<T> configure_controller(inotify_util::watch_t& confwatch) {
-    // clang-format off
-    return di::make_injector(
-        di::bind<>().to(confwatch),
-        configure_connection(),
-        configure_logger(),
-        configure_config(),
-        configure_eventloop(),
-        configure_bar());
-    // clang-format on
-  }
-}
+di::injector<unique_ptr<controller>> configure_controller(watch_t& confwatch);
 
 POLYBAR_NS_END
diff --git a/include/components/eventloop.hpp b/include/components/eventloop.hpp
index 6fc5e2cb..0096a5d2 100644
--- a/include/components/eventloop.hpp
+++ b/include/components/eventloop.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <moodycamel/blockingconcurrentqueue.h>
+#include <chrono>
 
 #include "common.hpp"
 #include "components/logger.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/base.hpp"
 
 POLYBAR_NS
 
@@ -30,7 +31,7 @@ class eventloop {
   ~eventloop() noexcept;
 
   bool enqueue(const entry_t& i);
-  void run(chrono::duration<double, std::milli> timeframe, int limit);
+  void run(std::chrono::duration<double, std::milli> timeframe, int limit);
   void stop();
 
   void set_update_cb(callback<>&& cb);
diff --git a/include/components/ipc.hpp b/include/components/ipc.hpp
index e4a6d8d7..40c1560a 100644
--- a/include/components/ipc.hpp
+++ b/include/components/ipc.hpp
@@ -2,6 +2,8 @@
 
 #include "common.hpp"
 #include "components/logger.hpp"
+#include "utils/functional.hpp"
+#include "utils/concurrency.hpp"
 
 POLYBAR_NS
 
diff --git a/include/components/logger.hpp b/include/components/logger.hpp
index 9afb969a..aafee342 100644
--- a/include/components/logger.hpp
+++ b/include/components/logger.hpp
@@ -3,6 +3,7 @@
 #include <cstdio>
 
 #include "common.hpp"
+#include "utils/factory.hpp"
 
 POLYBAR_NS
 
@@ -22,7 +23,6 @@ class logger {
   explicit logger(string level_name) : logger(parse_loglevel_name(level_name)) {}
 
   void verbosity(loglevel level);
-
   void verbosity(string level);
 
   /**
@@ -159,7 +159,7 @@ namespace {
    */
   template <typename T = const logger&>
   di::injector<T> configure_logger(loglevel level = loglevel::NONE) {
-    auto instance = factory::generic_singleton<logger>(level);
+    auto instance = factory_util::generic_singleton<logger>(level);
     return di::make_injector(di::bind<>().to(instance));
   }
 }
diff --git a/include/components/parser.hpp b/include/components/parser.hpp
index 17d7853b..959ad4a9 100644
--- a/include/components/parser.hpp
+++ b/include/components/parser.hpp
@@ -2,7 +2,6 @@
 
 #include "common.hpp"
 #include "components/signals.hpp"
-#include "components/types.hpp"
 
 POLYBAR_NS
 
diff --git a/include/components/signals.hpp b/include/components/signals.hpp
index ad43fd49..4e545b37 100644
--- a/include/components/signals.hpp
+++ b/include/components/signals.hpp
@@ -1,10 +1,22 @@
 #pragma once
 
 #include "common.hpp"
-#include "components/types.hpp"
+
+#include "utils/functional.hpp"
 
 POLYBAR_NS
 
+// fwd decl {{{
+
+enum class mousebtn;
+enum class syntaxtag;
+enum class alignment;
+enum class attribute;
+enum class gc;
+class color;
+
+// }}}
+
 /**
  * @TODO: Allow multiple signal handlers
  */
diff --git a/include/config.hpp.cmake b/include/config.hpp.cmake
index 005754c1..5488a666 100644
--- a/include/config.hpp.cmake
+++ b/include/config.hpp.cmake
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <iostream>
+#include <vector>
 
 #include "version.hpp"
 
@@ -21,7 +22,7 @@
 
 #ifdef DEBUG
 #cmakedefine01 DRAW_CLICKABLE_AREA_HINTS
-#cmakedefine DRAW_CLICKABLE_AREA_HINTS_OFFSET_Y @DRAW_CLICKABLE_AREA_HINTS_OFFSET_Y@
+#cmakedefine DRAW_CLICKABLE_AREA_HINTS_OFFSET_Y @DRAW_CLICKABLE_AREA_HINTS_OFFSET_Y @
 #ifndef DRAW_CLICKABLE_AREA_HINTS_OFFSET_Y
 #define DRAW_CLICKABLE_AREA_HINTS_OFFSET_Y 0
 #endif
@@ -46,16 +47,31 @@
 #define PATH_MESSAGING_FIFO "@SETTING_PATH_MESSAGING_FIFO@"
 #define PATH_TEMPERATURE_INFO "@SETTING_PATH_TEMPERATURE_INFO@"
 
-auto print_build_info = []() {
-  // clang-format off
-  std::cout << APP_NAME << " " << GIT_TAG
-            << "\n\n"
-            << "Built with: "
-              << (ENABLE_ALSA     ? "+" : "-") << "alsa "
-              << (ENABLE_I3       ? "+" : "-") << "i3 "
-              << (ENABLE_MPD      ? "+" : "-") << "mpd "
-              << (ENABLE_NETWORK  ? "+" : "-") << "network "
-            << "\n\n"
+auto version_details = [](const std::vector<std::string>& args) {
+  for (auto&& arg : args) {
+  if (arg.compare(0, 3, "-vv") == 0)
+      return true;
+  }
+  return false;
+};
+
+// clang-format off
+auto print_build_info = [](bool extended = false) {
+  std::cout << APP_NAME << " " << GIT_TAG << " " << "\n"
+            << "\n"
+            << "Features: "
+            << (ENABLE_ALSA    ? "+" : "-") << "alsa "
+            << (ENABLE_I3      ? "+" : "-") << "i3 "
+            << (ENABLE_MPD     ? "+" : "-") << "mpd "
+            << (ENABLE_NETWORK ? "+" : "-") << "network "
+            << "\n";
+  if (!extended)
+    return;
+  std::cout << "\n"
+            << "Build type: @CMAKE_BUILD_TYPE@" << "\n"
+            << "Compiler flags: @CMAKE_CXX_FLAGS@" << "\n"
+            << "Linker flags: @CMAKE_EXE_LINKER_FLAGS@" << "\n"
+            << "\n"
             << "ALSA_SOUNDCARD              " << ALSA_SOUNDCARD             << "\n"
             << "BSPWM_SOCKET_PATH           " << BSPWM_SOCKET_PATH          << "\n"
             << "BSPWM_STATUS_PREFIX         " << BSPWM_STATUS_PREFIX        << "\n"
@@ -73,7 +89,7 @@ auto print_build_info = []() {
             << "PATH_CPU_INFO               " << PATH_CPU_INFO              << "\n"
             << "PATH_MEMORY_INFO            " << PATH_MEMORY_INFO           << "\n"
             << "PATH_TEMPERATURE_INFO       " << PATH_TEMPERATURE_INFO      << "\n";
-  // clang-format on
 };
+// clang-format on
 
 // vim:ft=cpp
diff --git a/include/debug.hpp b/include/debug.hpp
index 4bc644b1..9d38b0b9 100644
--- a/include/debug.hpp
+++ b/include/debug.hpp
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <iostream>
+#include <chrono>
 
 template <class T>
 void benchmark_execution_speed(const T& expr) noexcept {
diff --git a/include/drawtypes/animation.hpp b/include/drawtypes/animation.hpp
index 4f573ff6..f39acfb1 100644
--- a/include/drawtypes/animation.hpp
+++ b/include/drawtypes/animation.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <chrono>
+
 #include "common.hpp"
 #include "components/config.hpp"
 #include "drawtypes/label.hpp"
@@ -7,6 +9,8 @@
 
 POLYBAR_NS
 
+namespace chrono = std::chrono;
+
 namespace drawtypes {
   class animation : public non_copyable_mixin<animation> {
    public:
diff --git a/include/modules/backlight.hpp b/include/modules/backlight.hpp
index be727d1b..4fa543d9 100644
--- a/include/modules/backlight.hpp
+++ b/include/modules/backlight.hpp
@@ -2,7 +2,7 @@
 
 #include "components/config.hpp"
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/inotify_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp
index c89b8d0a..fd75dcbe 100644
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@@ -2,7 +2,7 @@
 
 #include "common.hpp"
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/inotify_module.hpp"
 
 POLYBAR_NS
 
@@ -67,7 +67,7 @@ namespace modules {
     map<battery_value, string> m_valuepath;
     std::atomic<int> m_percentage{0};
     int m_fullat{100};
-    interval_t m_interval;
+    chrono::duration<double> m_interval;
     chrono::system_clock::time_point m_lastpoll;
     string m_timeformat;
     int m_unchanged{SKIP_N_UNCHANGED};
diff --git a/include/modules/bspwm.hpp b/include/modules/bspwm.hpp
index 8b8faa02..1c91a2d1 100644
--- a/include/modules/bspwm.hpp
+++ b/include/modules/bspwm.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "modules/meta.hpp"
+#include "modules/meta/event_module.hpp"
 #include "utils/bspwm.hpp"
 
 POLYBAR_NS
diff --git a/include/modules/counter.hpp b/include/modules/counter.hpp
index 87711d0a..71606734 100644
--- a/include/modules/counter.hpp
+++ b/include/modules/counter.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "modules/meta.hpp"
+#include "modules/meta/timer_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp
index da5e8711..bfff1c32 100644
--- a/include/modules/cpu.hpp
+++ b/include/modules/cpu.hpp
@@ -3,7 +3,7 @@
 #include <istream>
 
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/timer_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/date.hpp b/include/modules/date.hpp
index 72953e1a..8a6eaa28 100644
--- a/include/modules/date.hpp
+++ b/include/modules/date.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "modules/meta.hpp"
+#include "modules/meta/timer_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/fs.hpp b/include/modules/fs.hpp
index c2ae7210..bf814b35 100644
--- a/include/modules/fs.hpp
+++ b/include/modules/fs.hpp
@@ -2,7 +2,7 @@
 
 #include "components/config.hpp"
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/timer_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/i3.hpp b/include/modules/i3.hpp
index 079b3bf0..0e55ae5a 100644
--- a/include/modules/i3.hpp
+++ b/include/modules/i3.hpp
@@ -4,7 +4,7 @@
 
 #include "components/config.hpp"
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/event_module.hpp"
 #include "utils/i3.hpp"
 #include "utils/io.hpp"
 
diff --git a/include/modules/ipc.hpp b/include/modules/ipc.hpp
index 03e5f438..152cbd36 100644
--- a/include/modules/ipc.hpp
+++ b/include/modules/ipc.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "modules/meta.hpp"
+#include "modules/meta/static_module.hpp"
 #include "utils/command.hpp"
 
 POLYBAR_NS
diff --git a/include/modules/memory.hpp b/include/modules/memory.hpp
index ddbe85ee..f17e2dbd 100644
--- a/include/modules/memory.hpp
+++ b/include/modules/memory.hpp
@@ -3,7 +3,7 @@
 #include <istream>
 
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/timer_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/menu.hpp b/include/modules/menu.hpp
index c0a8ffee..fe372338 100644
--- a/include/modules/menu.hpp
+++ b/include/modules/menu.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "modules/meta.hpp"
+#include "modules/meta/static_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/meta.hpp b/include/modules/meta.hpp
deleted file mode 100644
index 75026ade..00000000
--- a/include/modules/meta.hpp
+++ /dev/null
@@ -1,558 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <condition_variable>
-#include <mutex>
-
-#include "common.hpp"
-#include "components/builder.hpp"
-#include "components/config.hpp"
-#include "components/logger.hpp"
-#include "utils/inotify.hpp"
-#include "utils/string.hpp"
-#include "utils/threading.hpp"
-
-POLYBAR_NS
-
-#define DEFAULT_FORMAT "format"
-
-#define DEFINE_MODULE(name, type) struct name : public type<name>
-#define CONST_MOD(name) static_cast<name const&>(*this)
-#define CAST_MOD(name) static_cast<name*>(this)
-
-// fwd decl
-namespace drawtypes {
-  class label;
-  using label_t = shared_ptr<label>;
-  class ramp;
-  using ramp_t = shared_ptr<ramp>;
-  class progressbar;
-  using progressbar_t = shared_ptr<progressbar>;
-  class animation;
-  using animation_t = shared_ptr<animation>;
-  using icon = label;
-  using icon_t = label_t;
-  class iconset;
-  using iconset_t = shared_ptr<iconset>;
-}
-
-namespace modules {
-  using namespace drawtypes;
-
-  DEFINE_ERROR(module_error);
-  DEFINE_CHILD_ERROR(undefined_format, module_error);
-  DEFINE_CHILD_ERROR(undefined_format_tag, module_error);
-
-  // class definition : module_format {{{
-
-  struct module_format {
-    string value;
-    vector<string> tags;
-    string fg;
-    string bg;
-    string ul;
-    string ol;
-    int spacing;
-    int padding;
-    int margin;
-    int offset;
-
-    string decorate(builder* builder, string output) {
-      if (offset != 0)
-        builder->offset(offset);
-      if (margin > 0)
-        builder->space(margin);
-      if (!bg.empty())
-        builder->background(bg);
-      if (!fg.empty())
-        builder->color(fg);
-      if (!ul.empty())
-        builder->underline(ul);
-      if (!ol.empty())
-        builder->overline(ol);
-      if (padding > 0)
-        builder->space(padding);
-
-      builder->append(output);
-
-      if (padding > 0)
-        builder->space(padding);
-      if (!ol.empty())
-        builder->overline_close();
-      if (!ul.empty())
-        builder->underline_close();
-      if (!fg.empty())
-        builder->color_close();
-      if (!bg.empty())
-        builder->background_close();
-      if (margin > 0)
-        builder->space(margin);
-
-      return builder->flush();
-    }
-  };
-
-  // }}}
-  // class definition : module_formatter {{{
-
-  class module_formatter {
-   public:
-    explicit module_formatter(const config& conf, string modname) : m_conf(conf), m_modname(modname) {}
-
-    void add(string name, string fallback, vector<string>&& tags, vector<string>&& whitelist = {}) {
-      auto format = make_unique<module_format>();
-
-      format->value = m_conf.get<string>(m_modname, name, fallback);
-      format->fg = m_conf.get<string>(m_modname, name + "-foreground", "");
-      format->bg = m_conf.get<string>(m_modname, name + "-background", "");
-      format->ul = m_conf.get<string>(m_modname, name + "-underline", "");
-      format->ol = m_conf.get<string>(m_modname, name + "-overline", "");
-      format->spacing = m_conf.get<int>(m_modname, name + "-spacing", DEFAULT_SPACING);
-      format->padding = m_conf.get<int>(m_modname, name + "-padding", 0);
-      format->margin = m_conf.get<int>(m_modname, name + "-margin", 0);
-      format->offset = m_conf.get<int>(m_modname, name + "-offset", 0);
-      format->tags.swap(tags);
-
-      for (auto&& tag : string_util::split(format->value, ' ')) {
-        if (tag[0] != '<' || tag[tag.length() - 1] != '>')
-          continue;
-        if (find(format->tags.begin(), format->tags.end(), tag) != format->tags.end())
-          continue;
-        if (find(whitelist.begin(), whitelist.end(), tag) != whitelist.end())
-          continue;
-        throw undefined_format_tag("[" + m_modname + "] Undefined \"" + name + "\" tag: " + tag);
-      }
-
-      m_formats.insert(make_pair(name, move(format)));
-    }
-
-    shared_ptr<module_format> get(string format_name) {
-      auto format = m_formats.find(format_name);
-      if (format == m_formats.end())
-        throw undefined_format("Format \"" + format_name + "\" has not been added");
-      return format->second;
-    }
-
-    bool has(string tag, string format_name) {
-      auto format = m_formats.find(format_name);
-      if (format == m_formats.end())
-        throw undefined_format(format_name.c_str());
-      return format->second->value.find(tag) != string::npos;
-    }
-
-    bool has(string tag) {
-      for (auto&& format : m_formats)
-        if (format.second->value.find(tag) != string::npos)
-          return true;
-      return false;
-    }
-
-   protected:
-    const config& m_conf;
-    string m_modname;
-    map<string, shared_ptr<module_format>> m_formats;
-  };
-
-  // }}}
-
-  // class definition : module_interface {{{
-
-  struct module_interface {
-   public:
-    virtual ~module_interface() {}
-
-    virtual string name() const = 0;
-    virtual bool running() const = 0;
-
-    virtual void setup() = 0;
-    virtual void start() = 0;
-    virtual void stop() = 0;
-    virtual void halt(string error_message) = 0;
-    virtual string contents() = 0;
-
-    virtual bool handle_event(string cmd) = 0;
-    virtual bool receive_events() const = 0;
-
-    virtual void set_update_cb(callback<>&& cb) = 0;
-    virtual void set_stop_cb(callback<>&& cb) = 0;
-  };
-
-  // }}}
-  // class definition : module {{{
-
-  template <class Impl>
-  class module : public module_interface {
-   public:
-    module(const bar_settings bar, const logger& logger, const config& config, string name)
-        : m_bar(bar)
-        , m_log(logger)
-        , m_conf(config)
-        , m_name("module/" + name)
-        , m_builder(make_unique<builder>(bar))
-        , m_formatter(make_unique<module_formatter>(m_conf, m_name)) {}
-
-    ~module() noexcept {
-      m_log.trace("%s: Deconstructing", name());
-
-      for (auto&& thread_ : m_threads) {
-        if (thread_.joinable()) {
-          thread_.join();
-        }
-      }
-    }
-
-    void set_update_cb(callback<>&& cb) {
-      m_update_callback = forward<decltype(cb)>(cb);
-    }
-
-    void set_stop_cb(callback<>&& cb) {
-      m_stop_callback = forward<decltype(cb)>(cb);
-    }
-
-    string name() const {
-      return m_name;
-    }
-
-    bool running() const {
-      return m_enabled.load(std::memory_order_relaxed);
-    }
-
-    void setup() {
-      m_log.trace("%s: Setup", m_name);
-
-      try {
-        CAST_MOD(Impl)->setup();
-      } catch (const std::exception& err) {
-        m_log.err("%s: Setup failed", m_name);
-        halt(err.what());
-      }
-    }
-
-    void stop() {
-      if (!running()) {
-        return;
-      }
-
-      m_log.info("%s: Stopping", name());
-      m_enabled.store(false, std::memory_order_relaxed);
-
-      wakeup();
-
-      std::lock_guard<threading_util::spin_lock> guard(m_lock);
-      {
-        CAST_MOD(Impl)->teardown();
-
-        if (m_mainthread.joinable()) {
-          m_mainthread.join();
-        }
-      }
-
-      if (m_stop_callback) {
-        m_stop_callback();
-      }
-    }
-
-    void halt(string error_message) {
-      m_log.err("%s: %s", name(), error_message);
-      m_log.warn("Stopping '%s'...", name());
-      stop();
-    }
-
-    void teardown() {}
-
-    string contents() {
-      return m_cache;
-    }
-
-    bool handle_event(string cmd) {
-      return CAST_MOD(Impl)->handle_event(cmd);
-    }
-
-    bool receive_events() const {
-      return false;
-    }
-
-   protected:
-    void broadcast() {
-      if (!running()) {
-        return;
-      }
-
-      m_cache = CAST_MOD(Impl)->get_output();
-
-      if (m_update_callback)
-        m_update_callback();
-      else
-        m_log.warn("%s: No handler, ignoring broadcast...", name());
-    }
-
-    void idle() {
-      CAST_MOD(Impl)->sleep(25ms);
-    }
-
-    void sleep(chrono::duration<double> sleep_duration) {
-      std::unique_lock<std::mutex> lck(m_sleeplock);
-      m_sleephandler.wait_for(lck, sleep_duration);
-    }
-
-    void wakeup() {
-      m_log.trace("%s: Release sleep lock", name());
-      m_sleephandler.notify_all();
-    }
-
-    string get_format() const {
-      return DEFAULT_FORMAT;
-    }
-
-    string get_output() {
-      if (!running()) {
-        m_log.trace("%s: Module is disabled", name());
-        return "";
-      }
-
-      auto format_name = CONST_MOD(Impl).get_format();
-      auto format = m_formatter->get(format_name);
-
-      int i = 0;
-      bool tag_built = true;
-
-      for (auto tag : string_util::split(format->value, ' ')) {
-        bool is_blankspace = tag.empty();
-
-        if (tag[0] == '<' && tag[tag.length() - 1] == '>') {
-          if (i > 0)
-            m_builder->space(format->spacing);
-          if (!(tag_built = CONST_MOD(Impl).build(m_builder.get(), tag)) && i > 0)
-            m_builder->remove_trailing_space(format->spacing);
-          if (tag_built)
-            i++;
-        } else if (is_blankspace && tag_built) {
-          m_builder->node(" ");
-        } else if (!is_blankspace) {
-          m_builder->node(tag);
-        }
-      }
-
-      return format->decorate(m_builder.get(), m_builder->flush());
-    }
-
-   protected:
-    callback<> m_update_callback;
-    callback<> m_stop_callback;
-
-    threading_util::spin_lock m_lock;
-
-    const bar_settings m_bar;
-    const logger& m_log;
-    const config& m_conf;
-
-    std::mutex m_sleeplock;
-    std::condition_variable m_sleephandler;
-
-    string m_name;
-    unique_ptr<builder> m_builder;
-    unique_ptr<module_formatter> m_formatter;
-    vector<thread> m_threads;
-    thread m_mainthread;
-
-   private:
-    stateflag m_enabled{true};
-    string m_cache;
-  };
-
-  // }}}
-
-  // class definition : static_module {{{
-
-  template <class Impl>
-  class static_module : public module<Impl> {
-   public:
-    using module<Impl>::module;
-
-    void start() {
-      CAST_MOD(Impl)->broadcast();
-    }
-
-    bool build(builder*, string) const {
-      return true;
-    }
-  };
-
-  // }}}
-  // class definition : timer_module {{{
-
-  using interval_t = chrono::duration<double>;
-
-  template <class Impl>
-  class timer_module : public module<Impl> {
-   public:
-    using module<Impl>::module;
-
-    void start() {
-      CAST_MOD(Impl)->m_mainthread = thread(&timer_module::runner, this);
-    }
-
-   protected:
-    interval_t m_interval = 1s;
-
-    void runner() {
-      try {
-        while (CONST_MOD(Impl).running()) {
-          std::lock_guard<threading_util::spin_lock> guard(this->m_lock);
-          {
-            if (CAST_MOD(Impl)->update())
-              CAST_MOD(Impl)->broadcast();
-          }
-          CAST_MOD(Impl)->sleep(m_interval);
-        }
-      } catch (const module_error& err) {
-        CAST_MOD(Impl)->halt(err.what());
-      } catch (const std::exception& err) {
-        CAST_MOD(Impl)->halt(err.what());
-      }
-    }
-  };
-
-  // }}}
-  // class definition : event_module {{{
-
-  template <class Impl>
-  class event_module : public module<Impl> {
-   public:
-    using module<Impl>::module;
-
-    void start() {
-      CAST_MOD(Impl)->m_mainthread = thread(&event_module::runner, this);
-    }
-
-   protected:
-    void runner() {
-      try {
-        // Send initial broadcast to warmup cache
-        if (CONST_MOD(Impl).running()) {
-          CAST_MOD(Impl)->update();
-          CAST_MOD(Impl)->broadcast();
-        }
-
-        while (CONST_MOD(Impl).running()) {
-          CAST_MOD(Impl)->idle();
-
-          if (!CONST_MOD(Impl).running())
-            break;
-
-          std::lock_guard<threading_util::spin_lock> guard(this->m_lock);
-          {
-            if (!CAST_MOD(Impl)->has_event())
-              continue;
-            if (!CONST_MOD(Impl).running())
-              break;
-            if (!CAST_MOD(Impl)->update())
-              continue;
-
-            CAST_MOD(Impl)->broadcast();
-          }
-        }
-      } catch (const module_error& err) {
-        CAST_MOD(Impl)->halt(err.what());
-      } catch (const std::exception& err) {
-        CAST_MOD(Impl)->halt(err.what());
-      }
-    }
-  };
-
-  // }}}
-  // class definition : inotify_module {{{
-
-  template <class Impl>
-  class inotify_module : public module<Impl> {
-   public:
-    using module<Impl>::module;
-
-    void start() {
-      CAST_MOD(Impl)->m_mainthread = thread(&inotify_module::runner, this);
-    }
-
-   protected:
-    void runner() {
-      try {
-        // Send initial broadcast to warmup cache
-        if (CONST_MOD(Impl).running()) {
-          CAST_MOD(Impl)->on_event(nullptr);
-          CAST_MOD(Impl)->broadcast();
-        }
-
-        while (CONST_MOD(Impl).running()) {
-          CAST_MOD(Impl)->poll_events();
-        }
-      } catch (const module_error& err) {
-        CAST_MOD(Impl)->halt(err.what());
-      } catch (const std::exception& err) {
-        CAST_MOD(Impl)->halt(err.what());
-      }
-    }
-
-    void watch(string path, int mask = IN_ALL_EVENTS) {
-      this->m_log.trace("%s: Attach inotify at %s", CONST_MOD(Impl).name(), path);
-      m_watchlist.insert(make_pair(path, mask));
-    }
-
-    void idle() {
-      CAST_MOD(Impl)->sleep(200ms);
-    }
-
-    void poll_events() {
-      vector<inotify_util::watch_t> watches;
-
-      try {
-        for (auto&& w : m_watchlist) {
-          watches.emplace_back(inotify_util::make_watch(w.first));
-          watches.back()->attach(w.second);
-        }
-      } catch (const system_error& e) {
-        watches.clear();
-        this->m_log.err("%s: Error while creating inotify watch (what: %s)", CONST_MOD(Impl).name(), e.what());
-        CAST_MOD(Impl)->sleep(0.1s);
-        return;
-      }
-
-      while (CONST_MOD(Impl).running()) {
-        std::unique_lock<threading_util::spin_lock> guard(this->m_lock);
-        {
-          for (auto&& w : watches) {
-            this->m_log.trace_x("%s: Poll inotify watch %s", CONST_MOD(Impl).name(), w->path());
-
-            if (w->poll(1000 / watches.size())) {
-              auto event = w->get_event();
-
-              for (auto&& w : watches) {
-                try {
-                  w->remove();
-                } catch (const system_error&) {
-                }
-              }
-
-              if (CAST_MOD(Impl)->on_event(event.get()))
-                CAST_MOD(Impl)->broadcast();
-
-              CAST_MOD(Impl)->idle();
-
-              return;
-            }
-
-            if (!CONST_MOD(Impl).running())
-              break;
-          }
-        }
-        guard.unlock();
-        CAST_MOD(Impl)->idle();
-      }
-    }
-
-   private:
-    map<string, int> m_watchlist;
-  };
-
-  // }}}
-}
-
-POLYBAR_NS_END
diff --git a/include/modules/meta/base.hpp b/include/modules/meta/base.hpp
new file mode 100644
index 00000000..7a11a858
--- /dev/null
+++ b/include/modules/meta/base.hpp
@@ -0,0 +1,171 @@
+#pragma once
+
+#include <algorithm>
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+
+#include "common.hpp"
+#include "components/config.hpp"
+#include "components/logger.hpp"
+#include "components/types.hpp"
+#include "utils/concurrency.hpp"
+#include "utils/functional.hpp"
+#include "utils/inotify.hpp"
+#include "utils/string.hpp"
+
+POLYBAR_NS
+
+#define DEFAULT_FORMAT "format"
+
+#define DEFINE_MODULE(name, type) struct name : public type<name>
+#define CONST_MOD(name) static_cast<name const&>(*this)
+#define CAST_MOD(name) static_cast<name*>(this)
+
+// fwd decl {{{
+
+namespace drawtypes {
+  class label;
+  using label_t = shared_ptr<label>;
+  class ramp;
+  using ramp_t = shared_ptr<ramp>;
+  class progressbar;
+  using progressbar_t = shared_ptr<progressbar>;
+  class animation;
+  using animation_t = shared_ptr<animation>;
+  using icon = label;
+  using icon_t = label_t;
+  class iconset;
+  using iconset_t = shared_ptr<iconset>;
+}
+
+class builder;
+
+// }}}
+
+namespace modules {
+  namespace chrono = std::chrono;
+  using namespace std::chrono_literals;
+  using namespace drawtypes;
+
+  DEFINE_ERROR(module_error);
+  DEFINE_CHILD_ERROR(undefined_format, module_error);
+  DEFINE_CHILD_ERROR(undefined_format_tag, module_error);
+
+  // class definition : module_format {{{
+
+  struct module_format {
+    string value;
+    vector<string> tags;
+    string fg;
+    string bg;
+    string ul;
+    string ol;
+    int spacing;
+    int padding;
+    int margin;
+    int offset;
+
+    string decorate(builder* builder, string output);
+  };
+
+  // }}}
+  // class definition : module_formatter {{{
+
+  class module_formatter {
+   public:
+    explicit module_formatter(const config& conf, string modname) : m_conf(conf), m_modname(modname) {}
+
+    void add(string name, string fallback, vector<string>&& tags, vector<string>&& whitelist = {});
+    bool has(string tag, string format_name);
+    bool has(string tag);
+    shared_ptr<module_format> get(string format_name);
+
+   protected:
+    const config& m_conf;
+    string m_modname;
+    map<string, shared_ptr<module_format>> m_formats;
+  };
+
+  // }}}
+
+  // class definition : module_interface {{{
+
+  struct module_interface {
+   public:
+    virtual ~module_interface() {}
+
+    virtual string name() const = 0;
+    virtual bool running() const = 0;
+
+    virtual void setup() = 0;
+    virtual void start() = 0;
+    virtual void stop() = 0;
+    virtual void halt(string error_message) = 0;
+    virtual string contents() = 0;
+
+    virtual bool handle_event(string cmd) = 0;
+    virtual bool receive_events() const = 0;
+
+    virtual void set_update_cb(callback<>&& cb) = 0;
+    virtual void set_stop_cb(callback<>&& cb) = 0;
+  };
+
+  // }}}
+  // class definition : module {{{
+
+  template <class Impl>
+  class module : public module_interface {
+   public:
+    module(const bar_settings bar, const logger& logger, const config& config, string name);
+    ~module() noexcept;
+
+    void set_update_cb(callback<>&& cb);
+    void set_stop_cb(callback<>&& cb);
+
+    string name() const;
+    bool running() const;
+    void setup();
+    void stop();
+    void halt(string error_message);
+    void teardown();
+    string contents();
+    bool handle_event(string cmd);
+    bool receive_events() const;
+
+   protected:
+    void broadcast();
+    void idle();
+    void sleep(chrono::duration<double> sleep_duration);
+    void wakeup();
+    string get_format() const;
+    string get_output();
+
+   protected:
+    callback<> m_update_callback;
+    callback<> m_stop_callback;
+
+    concurrency_util::spin_lock m_lock;
+
+    const bar_settings m_bar;
+    const logger& m_log;
+    const config& m_conf;
+
+    std::mutex m_sleeplock;
+    std::condition_variable m_sleephandler;
+
+    string m_name;
+    unique_ptr<builder> m_builder;
+    unique_ptr<module_formatter> m_formatter;
+    vector<thread> m_threads;
+    thread m_mainthread;
+
+   private:
+    stateflag m_enabled{true};
+    string m_cache;
+  };
+
+  // }}}
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/base.inl b/include/modules/meta/base.inl
new file mode 100644
index 00000000..9f241e3a
--- /dev/null
+++ b/include/modules/meta/base.inl
@@ -0,0 +1,185 @@
+#include "components/builder.hpp"
+
+POLYBAR_NS
+
+namespace modules {
+  // module<Impl> public {{{
+
+  template <typename Impl>
+  module<Impl>::module(const bar_settings bar, const logger& logger, const config& config, string name)
+        : m_bar(bar)
+        , m_log(logger)
+        , m_conf(config)
+        , m_name("module/" + name)
+        , m_builder(make_unique<builder>(bar))
+        , m_formatter(make_unique<module_formatter>(m_conf, m_name)) {}
+
+  template <typename Impl>
+  module<Impl>::~module() noexcept {
+    m_log.trace("%s: Deconstructing", name());
+
+    for (auto&& thread_ : m_threads) {
+      if (thread_.joinable()) {
+        thread_.join();
+      }
+    }
+  }
+
+  template <typename Impl>
+  void module<Impl>::set_update_cb(callback<>&& cb) {
+    m_update_callback = forward<decltype(cb)>(cb);
+  }
+
+  template <typename Impl>
+  void module<Impl>::set_stop_cb(callback<>&& cb) {
+    m_stop_callback = forward<decltype(cb)>(cb);
+  }
+
+  template <typename Impl>
+  string module<Impl>::name() const {
+    return m_name;
+  }
+
+  template <typename Impl>
+  bool module<Impl>::running() const {
+    return m_enabled.load(std::memory_order_relaxed);
+  }
+
+  template <typename Impl>
+  void module<Impl>::setup() {
+    m_log.trace("%s: Setup", m_name);
+
+    try {
+      CAST_MOD(Impl)->setup();
+    } catch (const std::exception& err) {
+      m_log.err("%s: Setup failed", m_name);
+      halt(err.what());
+    }
+  }
+
+  template <typename Impl>
+  void module<Impl>::stop() {
+    if (!running()) {
+      return;
+    }
+
+    m_log.info("%s: Stopping", name());
+    m_enabled.store(false, std::memory_order_relaxed);
+
+    wakeup();
+
+    std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
+    {
+      CAST_MOD(Impl)->teardown();
+
+      if (m_mainthread.joinable()) {
+        m_mainthread.join();
+      }
+    }
+
+    if (m_stop_callback) {
+      m_stop_callback();
+    }
+  }
+
+  template <typename Impl>
+  void module<Impl>::halt(string error_message) {
+    m_log.err("%s: %s", name(), error_message);
+    m_log.warn("Stopping '%s'...", name());
+    stop();
+  }
+
+  template <typename Impl>
+  void module<Impl>::teardown() {}
+
+  template <typename Impl>
+  string module<Impl>::contents() {
+    return m_cache;
+  }
+
+  template <typename Impl>
+  bool module<Impl>::handle_event(string cmd) {
+    return CAST_MOD(Impl)->handle_event(cmd);
+  }
+
+  template <typename Impl>
+  bool module<Impl>::receive_events() const {
+    return false;
+  }
+
+  // }}}
+  // module<Impl> protected {{{
+
+  template <typename Impl>
+  void module<Impl>::broadcast() {
+    if (!running()) {
+      return;
+    }
+
+    m_cache = CAST_MOD(Impl)->get_output();
+
+    if (m_update_callback)
+      m_update_callback();
+    else
+      m_log.warn("%s: No handler, ignoring broadcast...", name());
+  }
+
+  template <typename Impl>
+  void module<Impl>::idle() {
+    CAST_MOD(Impl)->sleep(25ms);
+  }
+
+  template <typename Impl>
+  void module<Impl>::sleep(chrono::duration<double> sleep_duration) {
+    std::unique_lock<std::mutex> lck(m_sleeplock);
+    m_sleephandler.wait_for(lck, sleep_duration);
+  }
+
+  template <typename Impl>
+  void module<Impl>::wakeup() {
+    m_log.trace("%s: Release sleep lock", name());
+    m_sleephandler.notify_all();
+  }
+
+  template <typename Impl>
+  string module<Impl>::get_format() const {
+    return DEFAULT_FORMAT;
+  }
+
+  template <typename Impl>
+  string module<Impl>::get_output() {
+    if (!running()) {
+      m_log.trace("%s: Module is disabled", name());
+      return "";
+    }
+
+    auto format_name = CONST_MOD(Impl).get_format();
+    auto format = m_formatter->get(format_name);
+
+    int i = 0;
+    bool tag_built = true;
+
+    for (auto tag : string_util::split(format->value, ' ')) {
+      bool is_blankspace = tag.empty();
+
+      if (tag[0] == '<' && tag[tag.length() - 1] == '>') {
+        if (i > 0)
+          m_builder->space(format->spacing);
+        if (!(tag_built = CONST_MOD(Impl).build(m_builder.get(), tag)) && i > 0)
+          m_builder->remove_trailing_space(format->spacing);
+        if (tag_built)
+          i++;
+      } else if (is_blankspace && tag_built) {
+        m_builder->node(" ");
+      } else if (!is_blankspace) {
+        m_builder->node(tag);
+      }
+    }
+
+    return format->decorate(m_builder.get(), m_builder->flush());
+  }
+
+  // }}}
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/event_module.hpp b/include/modules/meta/event_module.hpp
new file mode 100644
index 00000000..ae77b983
--- /dev/null
+++ b/include/modules/meta/event_module.hpp
@@ -0,0 +1,23 @@
+#pragma once
+
+// #include "components/types.hpp"
+// #include "components/builder.hpp"
+
+#include "modules/meta/base.hpp"
+
+POLYBAR_NS
+
+namespace modules {
+  template <class Impl>
+  class event_module : public module<Impl> {
+   public:
+    using module<Impl>::module;
+
+    void start();
+
+   protected:
+    void runner();
+  };
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/event_module.inl b/include/modules/meta/event_module.inl
new file mode 100644
index 00000000..4c2a5b8d
--- /dev/null
+++ b/include/modules/meta/event_module.inl
@@ -0,0 +1,51 @@
+POLYBAR_NS
+
+namespace modules {
+  // public {{{
+
+  template <class Impl>
+  void event_module<Impl>::start() {
+    CAST_MOD(Impl)->m_mainthread = thread(&event_module::runner, this);
+  }
+
+  // }}}
+  // protected {{{
+
+  template <class Impl>
+  void event_module<Impl>::runner() {
+    try {
+      // Send initial broadcast to warmup cache
+      if (CONST_MOD(Impl).running()) {
+        CAST_MOD(Impl)->update();
+        CAST_MOD(Impl)->broadcast();
+      }
+
+      while (CONST_MOD(Impl).running()) {
+        CAST_MOD(Impl)->idle();
+
+        if (!CONST_MOD(Impl).running())
+          break;
+
+        std::lock_guard<concurrency_util::spin_lock> guard(this->m_lock);
+        {
+          if (!CAST_MOD(Impl)->has_event())
+            continue;
+          if (!CONST_MOD(Impl).running())
+            break;
+          if (!CAST_MOD(Impl)->update())
+            continue;
+
+          CAST_MOD(Impl)->broadcast();
+        }
+      }
+    } catch (const module_error& err) {
+      CAST_MOD(Impl)->halt(err.what());
+    } catch (const std::exception& err) {
+      CAST_MOD(Impl)->halt(err.what());
+    }
+  }
+
+  // }}}
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/inotify_module.hpp b/include/modules/meta/inotify_module.hpp
new file mode 100644
index 00000000..1f46dbcd
--- /dev/null
+++ b/include/modules/meta/inotify_module.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "components/builder.hpp"
+#include "modules/meta/base.hpp"
+
+POLYBAR_NS
+
+namespace modules {
+  template <class Impl>
+  class inotify_module : public module<Impl> {
+   public:
+    using module<Impl>::module;
+
+    void start();
+
+   protected:
+    void runner();
+    void watch(string path, int mask = IN_ALL_EVENTS);
+    void idle();
+    void poll_events();
+
+   private:
+    map<string, int> m_watchlist;
+  };
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/inotify_module.inl b/include/modules/meta/inotify_module.inl
new file mode 100644
index 00000000..0e70adf3
--- /dev/null
+++ b/include/modules/meta/inotify_module.inl
@@ -0,0 +1,96 @@
+POLYBAR_NS
+
+namespace modules {
+  // public {{{
+
+  template <class Impl>
+  void inotify_module<Impl>::start() {
+    CAST_MOD(Impl)->m_mainthread = thread(&inotify_module::runner, this);
+  }
+
+  // }}}
+  // protected {{{
+
+  template <class Impl>
+  void inotify_module<Impl>::runner() {
+    try {
+      // Send initial broadcast to warmup cache
+      if (CONST_MOD(Impl).running()) {
+        CAST_MOD(Impl)->on_event(nullptr);
+        CAST_MOD(Impl)->broadcast();
+      }
+
+      while (CONST_MOD(Impl).running()) {
+        CAST_MOD(Impl)->poll_events();
+      }
+    } catch (const module_error& err) {
+      CAST_MOD(Impl)->halt(err.what());
+    } catch (const std::exception& err) {
+      CAST_MOD(Impl)->halt(err.what());
+    }
+  }
+
+  template <class Impl>
+  void inotify_module<Impl>::watch(string path, int mask) {
+    this->m_log.trace("%s: Attach inotify at %s", CONST_MOD(Impl).name(), path);
+    m_watchlist.insert(make_pair(path, mask));
+  }
+
+  template <class Impl>
+  void inotify_module<Impl>::idle() {
+    CAST_MOD(Impl)->sleep(200ms);
+  }
+
+  template <class Impl>
+  void inotify_module<Impl>::poll_events() {
+    vector<inotify_util::watch_t> watches;
+
+    try {
+      for (auto&& w : m_watchlist) {
+        watches.emplace_back(inotify_util::make_watch(w.first));
+        watches.back()->attach(w.second);
+      }
+    } catch (const system_error& e) {
+      watches.clear();
+      this->m_log.err("%s: Error while creating inotify watch (what: %s)", CONST_MOD(Impl).name(), e.what());
+      CAST_MOD(Impl)->sleep(0.1s);
+      return;
+    }
+
+    while (CONST_MOD(Impl).running()) {
+      std::unique_lock<concurrency_util::spin_lock> guard(this->m_lock);
+      {
+        for (auto&& w : watches) {
+          this->m_log.trace_x("%s: Poll inotify watch %s", CONST_MOD(Impl).name(), w->path());
+
+          if (w->poll(1000 / watches.size())) {
+            auto event = w->get_event();
+
+            for (auto&& w : watches) {
+              try {
+                w->remove();
+              } catch (const system_error&) {
+              }
+            }
+
+            if (CAST_MOD(Impl)->on_event(event.get()))
+              CAST_MOD(Impl)->broadcast();
+
+            CAST_MOD(Impl)->idle();
+
+            return;
+          }
+
+          if (!CONST_MOD(Impl).running())
+            break;
+        }
+      }
+      guard.unlock();
+      CAST_MOD(Impl)->idle();
+    }
+  }
+
+  // }}}
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/static_module.hpp b/include/modules/meta/static_module.hpp
new file mode 100644
index 00000000..10aa83cb
--- /dev/null
+++ b/include/modules/meta/static_module.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+// #include "components/builder.hpp"
+// #include "components/types.hpp"
+
+#include "modules/meta/base.hpp"
+
+POLYBAR_NS
+
+namespace modules {
+  template <class Impl>
+  class static_module : public module<Impl> {
+   public:
+    using module<Impl>::module;
+
+    void start();
+    bool build(builder*, string) const;
+  };
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/static_module.inl b/include/modules/meta/static_module.inl
new file mode 100644
index 00000000..db4c32f4
--- /dev/null
+++ b/include/modules/meta/static_module.inl
@@ -0,0 +1,15 @@
+POLYBAR_NS
+
+namespace modules {
+  template <typename Impl>
+  void static_module<Impl>::start() {
+    CAST_MOD(Impl)->broadcast();
+  }
+
+  template <typename Impl>
+  bool static_module<Impl>::build(builder*, string) const {
+    return true;
+  }
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/timer_module.hpp b/include/modules/meta/timer_module.hpp
new file mode 100644
index 00000000..8e46bf26
--- /dev/null
+++ b/include/modules/meta/timer_module.hpp
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <chrono>
+
+#include "modules/meta/base.hpp"
+
+POLYBAR_NS
+
+namespace chrono = std::chrono;
+
+namespace modules {
+  using interval_t = chrono::duration<double>;
+
+  template <class Impl>
+  class timer_module : public module<Impl> {
+   public:
+    using module<Impl>::module;
+
+    void start();
+
+   protected:
+    interval_t m_interval{1};
+
+    void runner();
+  };
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/meta/timer_module.inl b/include/modules/meta/timer_module.inl
new file mode 100644
index 00000000..dbda961b
--- /dev/null
+++ b/include/modules/meta/timer_module.inl
@@ -0,0 +1,35 @@
+POLYBAR_NS
+
+namespace modules {
+  // public {{{
+
+  template <typename Impl>
+  void timer_module<Impl>::start() {
+    CAST_MOD(Impl)->m_mainthread = thread(&timer_module::runner, this);
+  }
+
+  // }}}
+  // protected {{{
+
+  template <typename Impl>
+  void timer_module<Impl>::runner() {
+    try {
+      while (CONST_MOD(Impl).running()) {
+        std::lock_guard<concurrency_util::spin_lock> guard(this->m_lock);
+        {
+          if (CAST_MOD(Impl)->update())
+            CAST_MOD(Impl)->broadcast();
+        }
+        CAST_MOD(Impl)->sleep(m_interval);
+      }
+    } catch (const module_error& err) {
+      CAST_MOD(Impl)->halt(err.what());
+    } catch (const std::exception& err) {
+      CAST_MOD(Impl)->halt(err.what());
+    }
+  }
+
+  // }}}
+}
+
+POLYBAR_NS_END
diff --git a/include/modules/mpd.hpp b/include/modules/mpd.hpp
index 6dbf450c..2b77b723 100644
--- a/include/modules/mpd.hpp
+++ b/include/modules/mpd.hpp
@@ -1,15 +1,18 @@
 #pragma once
 
 #include <csignal>
+#include <chrono>
 
 #include "adapters/mpd.hpp"
-#include "modules/meta.hpp"
-#include "utils/threading.hpp"
+#include "modules/meta/event_module.hpp"
+#include "utils/concurrency.hpp"
 
 POLYBAR_NS
 
 using namespace mpd;
 
+namespace chrono = std::chrono;
+
 namespace modules {
   class mpd_module : public event_module<mpd_module> {
    public:
diff --git a/include/modules/network.hpp b/include/modules/network.hpp
index f83b4f90..b2378bfd 100644
--- a/include/modules/network.hpp
+++ b/include/modules/network.hpp
@@ -2,7 +2,7 @@
 
 #include "adapters/net.hpp"
 #include "components/config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/timer_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/script.hpp b/include/modules/script.hpp
index 98f582f0..c35c4de2 100644
--- a/include/modules/script.hpp
+++ b/include/modules/script.hpp
@@ -1,10 +1,14 @@
 #pragma once
 
-#include "modules/meta.hpp"
+#include <chrono>
+
+#include "modules/meta/event_module.hpp"
 #include "utils/command.hpp"
 
 POLYBAR_NS
 
+namespace chrono = std::chrono;
+
 #define OUTPUT_ACTION(BUTTON)     \
   if (!m_actions[BUTTON].empty()) \
   m_builder->cmd(BUTTON, string_util::replace_all(m_actions[BUTTON], "%counter%", counter_str))
@@ -29,7 +33,7 @@ namespace modules {
 
     string m_exec;
     bool m_tail = false;
-    interval_t m_interval = 0s;
+    chrono::duration<double> m_interval{0};
     size_t m_maxlen = 0;
     bool m_ellipsis = true;
     map<mousebtn, string> m_actions;
diff --git a/include/modules/temperature.hpp b/include/modules/temperature.hpp
index 8375fdea..f9891aad 100644
--- a/include/modules/temperature.hpp
+++ b/include/modules/temperature.hpp
@@ -3,7 +3,7 @@
 #include <istream>
 
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/timer_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/text.hpp b/include/modules/text.hpp
index 8ea93fb3..f94ae4b1 100644
--- a/include/modules/text.hpp
+++ b/include/modules/text.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "modules/meta.hpp"
+#include "modules/meta/static_module.hpp"
 
 POLYBAR_NS
 
diff --git a/include/modules/unsupported.hpp b/include/modules/unsupported.hpp
index 8bf3998e..0a509d62 100644
--- a/include/modules/unsupported.hpp
+++ b/include/modules/unsupported.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "modules/meta.hpp"
+#include "modules/meta/event_module.hpp"
+#include "modules/meta/timer_module.hpp"
 
 #define DEFINE_UNSUPPORTED_MODULE(MODULE_NAME, MODULE_TYPE)                             \
   class MODULE_NAME : public module<MODULE_NAME> {                                      \
diff --git a/include/modules/volume.hpp b/include/modules/volume.hpp
index 5ecec901..e8e8ec72 100644
--- a/include/modules/volume.hpp
+++ b/include/modules/volume.hpp
@@ -3,7 +3,7 @@
 #include "adapters/alsa.hpp"
 #include "components/config.hpp"
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/event_module.hpp"
 
 POLYBAR_NS
 
@@ -51,14 +51,10 @@ namespace modules {
 
     map<mixer, mixer_t> m_mixers;
     map<control, control_t> m_controls;
-
-    int m_headphoneid = 0;
-
-    bool m_mapped;
-
+    int m_headphoneid{0};
+    bool m_mapped{false};
     stateflag m_muted{false};
     stateflag m_headphones{false};
-
     std::atomic<int> m_volume{0};
   };
 }
diff --git a/include/modules/xbacklight.hpp b/include/modules/xbacklight.hpp
index 53af3d1f..de079126 100644
--- a/include/modules/xbacklight.hpp
+++ b/include/modules/xbacklight.hpp
@@ -1,14 +1,14 @@
 #pragma once
 
 #include "components/config.hpp"
-#include "x11/connection.hpp"
 #include "x11/randr.hpp"
-#include "x11/xutils.hpp"
 #include "config.hpp"
-#include "modules/meta.hpp"
+#include "modules/meta/static_module.hpp"
 
 POLYBAR_NS
 
+class connection;
+
 namespace modules {
   /**
    * Backlight module built using the RandR X extension.
@@ -28,6 +28,8 @@ namespace modules {
    public:
     using static_module::static_module;
 
+    xbacklight_module(const bar_settings bar, const logger& logger, const config& config, string name);
+
     void setup();
     void teardown();
     void handle(const evt::randr_notify& evt);
@@ -47,7 +49,7 @@ namespace modules {
     static constexpr auto EVENT_SCROLLUP = "xbacklight+";
     static constexpr auto EVENT_SCROLLDOWN = "xbacklight-";
 
-    connection& m_connection{configure_connection().create<connection&>()};
+    connection& m_connection;
     monitor_t m_output;
     xcb_window_t m_proxy;
     xcb_timestamp_t m_timestamp;
diff --git a/include/modules/xwindow.hpp b/include/modules/xwindow.hpp
index 6e3d1077..82153ec5 100644
--- a/include/modules/xwindow.hpp
+++ b/include/modules/xwindow.hpp
@@ -3,14 +3,16 @@
 #include <bitset>
 
 #include "components/config.hpp"
-#include "modules/meta.hpp"
-#include "x11/connection.hpp"
+#include "modules/meta/static_module.hpp"
+#include "x11/events.hpp"
 #include "x11/ewmh.hpp"
 #include "x11/icccm.hpp"
 #include "x11/window.hpp"
 
 POLYBAR_NS
 
+class connection;
+
 namespace modules {
   /**
    * Wrapper used to update the event mask of the
diff --git a/include/utils/command.hpp b/include/utils/command.hpp
index 2ad48276..0d939507 100644
--- a/include/utils/command.hpp
+++ b/include/utils/command.hpp
@@ -2,7 +2,8 @@
 
 #include "common.hpp"
 #include "components/logger.hpp"
-#include "utils/threading.hpp"
+#include "utils/concurrency.hpp"
+#include "utils/functional.hpp"
 
 POLYBAR_NS
 
@@ -69,7 +70,7 @@ namespace command_util {
     pid_t m_forkpid;
     int m_forkstatus;
 
-    threading_util::spin_lock m_pipelock;
+    concurrency_util::spin_lock m_pipelock;
   };
 
   using command_t = unique_ptr<command>;
diff --git a/include/utils/threading.hpp b/include/utils/concurrency.hpp
similarity index 82%
rename from include/utils/threading.hpp
rename to include/utils/concurrency.hpp
index de0e0650..0210bd0c 100644
--- a/include/utils/threading.hpp
+++ b/include/utils/concurrency.hpp
@@ -1,13 +1,24 @@
 #pragma once
 
+#include <atomic>
 #include <mutex>
+#include <thread>
 
 #include "common.hpp"
 #include "utils/mixins.hpp"
 
 POLYBAR_NS
 
-namespace threading_util {
+namespace this_thread = std::this_thread;
+
+using std::thread;
+
+template <typename T>
+using atomic = std::atomic<T>;
+
+using stateflag = atomic<bool>;
+
+namespace concurrency_util {
   namespace locking_strategy {
     struct no_backoff {
       bool operator()() {
diff --git a/include/utils/env.hpp b/include/utils/env.hpp
new file mode 100644
index 00000000..da4311b0
--- /dev/null
+++ b/include/utils/env.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "common.hpp"
+
+POLYBAR_NS
+
+namespace env_util {
+  bool has(const char* var);
+  string get(const char* var, string fallback = "");
+}
+
+POLYBAR_NS_END
diff --git a/include/utils/factory.hpp b/include/utils/factory.hpp
new file mode 100644
index 00000000..99370524
--- /dev/null
+++ b/include/utils/factory.hpp
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "common.hpp"
+
+POLYBAR_NS
+
+namespace factory_util {
+  struct null_deleter {
+    template <typename T>
+    void operator()(T*) const {}
+  };
+
+  template <class InstanceType, class... Deps>
+  unique_ptr<InstanceType> generic_instance(Deps... deps) {
+    return make_unique<InstanceType>(deps...);
+  }
+
+  template <class InstanceType, class... Deps>
+  shared_ptr<InstanceType> generic_singleton(Deps... deps) {
+    static auto instance = make_shared<InstanceType>(deps...);
+    return instance;
+  }
+}
+
+POLYBAR_NS_END
diff --git a/include/utils/functional.hpp b/include/utils/functional.hpp
new file mode 100644
index 00000000..9d254704
--- /dev/null
+++ b/include/utils/functional.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <functional>
+
+#include "common.hpp"
+
+POLYBAR_NS
+
+template <typename... Args>
+using callback = function<void(Args...)>;
+
+POLYBAR_NS_END
diff --git a/include/utils/scope.hpp b/include/utils/scope.hpp
index 29c7fdd3..17bb940a 100644
--- a/include/utils/scope.hpp
+++ b/include/utils/scope.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+// TODO: move to functional.hpp
+
 #include "common.hpp"
 
 #include "components/logger.hpp"
diff --git a/include/utils/throttle.hpp b/include/utils/throttle.hpp
index dfa5e7f6..d4b69e55 100644
--- a/include/utils/throttle.hpp
+++ b/include/utils/throttle.hpp
@@ -1,12 +1,15 @@
 #pragma once
 
 #include <deque>
+#include <chrono>
 
 #include "common.hpp"
 #include "components/logger.hpp"
 
 POLYBAR_NS
 
+namespace chrono = std::chrono;
+
 namespace throttle_util {
   using timewindow = chrono::duration<double, std::milli>;
   using timepoint_clock = chrono::high_resolution_clock;
diff --git a/include/utils/time.hpp b/include/utils/time.hpp
new file mode 100644
index 00000000..7968f5f2
--- /dev/null
+++ b/include/utils/time.hpp
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <chrono>
+
+#include "common.hpp"
+
+POLYBAR_NS
+
+namespace chrono = std::chrono;
+
+namespace time_util {
+  using clock_t = chrono::high_resolution_clock;
+
+  template <typename T, typename Dur = chrono::milliseconds>
+  auto measure(const T& expr) noexcept {
+    auto start = clock_t::now();
+    expr();
+    auto finish = clock_t::now();
+    return chrono::duration_cast<Dur>(finish - start).count();
+  }
+}
+
+POLYBAR_NS_END
diff --git a/include/x11/connection.hpp b/include/x11/connection.hpp
index ca6427bb..b453cb48 100644
--- a/include/x11/connection.hpp
+++ b/include/x11/connection.hpp
@@ -5,6 +5,7 @@
 #include <xcb/xcb.h>
 #include <iomanip>
 #include <xpp/xpp.hpp>
+#include <boost/optional.hpp>
 
 #include "common.hpp"
 #include "utils/memory.hpp"
@@ -13,6 +14,16 @@
 #include "x11/types.hpp"
 #include "x11/xutils.hpp"
 
+#ifdef ENABLE_DAMAGE_EXT
+#include "x11/damage.hpp"
+#endif
+#ifdef ENABLE_RANDR_EXT
+#include "x11/randr.hpp"
+#endif
+#ifdef ENABLE_RENDER_EXT
+#include "x11/render.hpp"
+#endif
+
 POLYBAR_NS
 
 using xpp_connection = xpp::connection<
@@ -60,7 +71,7 @@ class connection : public xpp_connection {
 
   void send_dummy_event(xcb_window_t t, uint32_t ev = XCB_EVENT_MASK_STRUCTURE_NOTIFY) const;
 
-  optional<xcb_visualtype_t*> visual_type(xcb_screen_t* screen, int match_depth = 32);
+  boost::optional<xcb_visualtype_t*> visual_type(xcb_screen_t* screen, int match_depth = 32);
 
   static string error_str(int error_code);
 
@@ -86,15 +97,6 @@ class connection : public xpp_connection {
   xcb_screen_t* m_screen = nullptr;
 };
 
-namespace {
-  /**
-   * Configure injection module
-   */
-  template <typename T = connection&>
-  di::injector<T> configure_connection() {
-    return di::make_injector(
-        di::bind<>().to(factory::generic_singleton<connection>(xutils::get_connection())));
-  }
-}
+di::injector<connection&> configure_connection();
 
 POLYBAR_NS_END
diff --git a/include/x11/damage.hpp b/include/x11/damage.hpp
new file mode 100644
index 00000000..4e643ef6
--- /dev/null
+++ b/include/x11/damage.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "config.hpp"
+
+#ifndef ENABLE_DAMAGE_EXT
+#error "X Damage extension is disabled..."
+#endif
+
+#include <xpp/proto/damage.hpp>
diff --git a/include/x11/events.hpp b/include/x11/events.hpp
new file mode 100644
index 00000000..deb070ab
--- /dev/null
+++ b/include/x11/events.hpp
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "config.hpp"
+
+#include <xpp/xpp.hpp>
+
+#include "common.hpp"
+
+POLYBAR_NS
+
+class connection;
+
+namespace evt {
+  // window focus events
+  using focus_in = xpp::x::event::focus_in<connection&>;
+  using focus_out = xpp::x::event::focus_out<connection&>;
+
+  // cursor events
+  using enter_notify = xpp::x::event::enter_notify<connection&>;
+  using leave_notify = xpp::x::event::leave_notify<connection&>;
+  using motion_notify = xpp::x::event::motion_notify<connection&>;
+
+  // keyboard events
+  using button_press = xpp::x::event::button_press<connection&>;
+  using button_release = xpp::x::event::button_release<connection&>;
+  using key_press = xpp::x::event::key_press<connection&>;
+  using key_release = xpp::x::event::key_release<connection&>;
+  using keymap_notify = xpp::x::event::keymap_notify<connection&>;
+
+  // render events
+  using circulate_notify = xpp::x::event::circulate_notify<connection&>;
+  using circulate_request = xpp::x::event::circulate_request<connection&>;
+  using colormap_notify = xpp::x::event::colormap_notify<connection&>;
+  using configure_notify = xpp::x::event::configure_notify<connection&>;
+  using configure_request = xpp::x::event::configure_request<connection&>;
+  using create_notify = xpp::x::event::create_notify<connection&>;
+  using destroy_notify = xpp::x::event::destroy_notify<connection&>;
+  using expose = xpp::x::event::expose<connection&>;
+  using graphics_exposure = xpp::x::event::graphics_exposure<connection&>;
+  using gravity_notify = xpp::x::event::gravity_notify<connection&>;
+  using map_notify = xpp::x::event::map_notify<connection&>;
+  using map_request = xpp::x::event::map_request<connection&>;
+  using mapping_notify = xpp::x::event::mapping_notify<connection&>;
+  using no_exposure = xpp::x::event::no_exposure<connection&>;
+  using reparent_notify = xpp::x::event::reparent_notify<connection&>;
+  using resize_request = xpp::x::event::resize_request<connection&>;
+  using unmap_notify = xpp::x::event::unmap_notify<connection&>;
+  using visibility_notify = xpp::x::event::visibility_notify<connection&>;
+
+  // data events
+  using client_message = xpp::x::event::client_message<connection&>;
+  using ge_generic = xpp::x::event::ge_generic<connection&>;
+  using property_notify = xpp::x::event::property_notify<connection&>;
+
+  // selection events
+  using selection_clear = xpp::x::event::selection_clear<connection&>;
+  using selection_notify = xpp::x::event::selection_notify<connection&>;
+  using selection_request = xpp::x::event::selection_request<connection&>;
+}
+
+POLYBAR_NS_END
diff --git a/include/x11/fontmanager.hpp b/include/x11/fonts.hpp
similarity index 69%
rename from include/x11/fontmanager.hpp
rename to include/x11/fonts.hpp
index e2dc0e28..d163f1d3 100644
--- a/include/x11/fontmanager.hpp
+++ b/include/x11/fonts.hpp
@@ -1,18 +1,18 @@
 #pragma once
 
 #include <X11/Xft/Xft.h>
-#include <X11/Xlib-xcb.h>
 #include <xcb/xcbext.h>
 
 #include "common.hpp"
 #include "components/logger.hpp"
 #include "x11/color.hpp"
-#include "x11/connection.hpp"
 #include "x11/types.hpp"
-#include "x11/xlib.hpp"
 
 POLYBAR_NS
 
+// fwd
+class connection;
+
 #define XFT_MAXCHARS (1 << 16)
 extern array<char, XFT_MAXCHARS> xft_widths;
 extern array<wchar_t, XFT_MAXCHARS> xft_chars;
@@ -32,20 +32,15 @@ struct fonttype {
 };
 
 struct fonttype_deleter {
-  void operator()(fonttype* f) {
-    if (f->xft != nullptr)
-      XftFontClose(xlib::get_display(), f->xft);
-    else
-      xcb_close_font(xutils::get_connection(), f->ptr);
-  }
+  void operator()(fonttype* f);
 };
 
 using font_t = unique_ptr<fonttype, fonttype_deleter>;
 
-class fontmanager {
+class font_manager {
  public:
-  explicit fontmanager(connection& conn, const logger& logger);
-  ~fontmanager();
+  explicit font_manager(connection& conn, const logger& logger);
+  ~font_manager();
 
   void set_preferred_font(int index);
 
@@ -79,14 +74,6 @@ class fontmanager {
   XftColor m_xftcolor;
 };
 
-namespace {
-  /**
-   * Configure injection module
-   */
-  template <typename T = unique_ptr<fontmanager>>
-  di::injector<T> configure_fontmanager() {
-    return di::make_injector(configure_connection(), configure_logger());
-  }
-}
+di::injector<unique_ptr<font_manager>> configure_font_manager();
 
 POLYBAR_NS_END
diff --git a/include/x11/icccm.hpp b/include/x11/icccm.hpp
index 9c008a13..ff5ead90 100644
--- a/include/x11/icccm.hpp
+++ b/include/x11/icccm.hpp
@@ -3,7 +3,6 @@
 #include <xcb/xcb_icccm.h>
 
 #include "common.hpp"
-#include "x11/connection.hpp"
 
 POLYBAR_NS
 
diff --git a/include/x11/randr.hpp b/include/x11/randr.hpp
index a9a6b003..869759d0 100644
--- a/include/x11/randr.hpp
+++ b/include/x11/randr.hpp
@@ -3,15 +3,23 @@
 #include "config.hpp"
 
 #ifndef ENABLE_RANDR_EXT
-#error "RandR extension is disabled..."
+#error "X RandR extension is disabled..."
 #endif
 
+#include <xpp/proto/randr.hpp>
+#include <xpp/xpp.hpp>
+
 #include "common.hpp"
-#include "utils/memory.hpp"
-#include "x11/connection.hpp"
 
 POLYBAR_NS
 
+class connection;
+
+namespace evt {
+  using randr_notify = xpp::randr::event::notify<connection&>;
+  using randr_screen_change_notify = xpp::randr::event::screen_change_notify<connection&>;
+}
+
 struct backlight_values {
   uint32_t atom = 0;
   uint32_t min = 0;
@@ -28,16 +36,7 @@ struct randr_output {
   xcb_randr_output_t output;
   backlight_values backlight;
 
-  /**
-   * Workaround for the inconsistent naming
-   * of outputs between my intel and nvidia
-   * drivers (xf86-video-intel drops the dash)
-   */
-  bool match(const string& o, bool strict = false) const {
-    if (strict && name != o)
-      return false;
-    return name == o || name == string_util::replace(o, "-", "");
-  }
+  bool match(const string& o, bool strict = false) const;
 };
 
 using monitor_t = shared_ptr<randr_output>;
diff --git a/include/x11/render.hpp b/include/x11/render.hpp
new file mode 100644
index 00000000..134569c3
--- /dev/null
+++ b/include/x11/render.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "config.hpp"
+
+#ifndef ENABLE_RENDER_EXT
+#error "X Render extension is disabled..."
+#endif
+
+#include <xpp/proto/render.hpp>
diff --git a/include/x11/tray.hpp b/include/x11/tray.hpp
index 6b02c045..f5755bd4 100644
--- a/include/x11/tray.hpp
+++ b/include/x11/tray.hpp
@@ -1,12 +1,11 @@
 #pragma once
 
 #include <xcb/xcb.h>
-#include <mutex>
 
 #include "common.hpp"
 #include "components/logger.hpp"
 #include "components/types.hpp"
-#include "x11/graphics.hpp"
+#include "utils/concurrency.hpp"
 
 #define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
 #define _NET_SYSTEM_TRAY_ORIENTATION_VERT 1
@@ -24,6 +23,10 @@ POLYBAR_NS
 class connection;
 struct xembed_data;
 
+namespace graphics_util {
+  struct root_pixmap;
+}
+
 using root_pixmap = graphics_util::root_pixmap;
 
 // class definition : settings {{{
diff --git a/include/x11/types.hpp b/include/x11/types.hpp
index bea128ba..47945bc8 100644
--- a/include/x11/types.hpp
+++ b/include/x11/types.hpp
@@ -2,118 +2,47 @@
 
 #include "config.hpp"
 
-#include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
-#include <xcb/xcb_util.h>
-#ifdef ENABLE_DAMAGE_EXT
-#include <xpp/proto/damage.hpp>
-#endif
+// fwd
 #ifdef ENABLE_RANDR_EXT
-#include <xpp/proto/randr.hpp>
-#endif
-#ifdef ENABLE_RENDER_EXT
-#include <xpp/proto/render.hpp>
+namespace xpp {
+  namespace randr {
+    class extension;
+  }
+}
 #endif
+
 #include <xpp/xpp.hpp>
 
 #include "common.hpp"
-#include "x11/connection.hpp"
 
 POLYBAR_NS
 
-// xpp types {{{
-
 class connection;
 
-using registry = xpp::event::registry<connection&
+using gcontext = xpp::gcontext<connection&>;
+using pixmap = xpp::pixmap<connection&>;
+using drawable = xpp::drawable<connection&>;
+using colormap = xpp::colormap<connection&>;
+using atom = xpp::atom<connection&>;
+using font = xpp::font<connection&>;
+using cursor = xpp::cursor<connection&>;
+
+using registry = xpp::event::registry<connection&,
 #ifdef ENABLE_DAMAGE_EXT
-    ,
     xpp::damage::extension
 #endif
 #ifdef ENABLE_RANDR_EXT
+#ifdef ENABLE_DAMAGE_EXT
     ,
+#endif
     xpp::randr::extension
 #endif
 #ifdef ENABLE_RENDER_EXT
+#ifdef ENABLE_RANDR_EXT
     ,
+#endif
     xpp::render::extension
 #endif
     >;
 
-using atom = xpp::atom<connection&>;
-using colormap = xpp::colormap<connection&>;
-using cursor = xpp::cursor<connection&>;
-using drawable = xpp::drawable<connection&>;
-using font = xpp::font<connection&>;
-using gcontext = xpp::gcontext<connection&>;
-using pixmap = xpp::pixmap<connection&>;
-
-// }}}
-
-namespace evt {
-  // window focus events {{{
-
-  using focus_in = xpp::x::event::focus_in<connection&>;
-  using focus_out = xpp::x::event::focus_out<connection&>;
-
-  // }}}
-  // cursor events {{{
-
-  using enter_notify = xpp::x::event::enter_notify<connection&>;
-  using leave_notify = xpp::x::event::leave_notify<connection&>;
-  using motion_notify = xpp::x::event::motion_notify<connection&>;
-
-  // }}}
-  // keyboard events {{{
-
-  using button_press = xpp::x::event::button_press<connection&>;
-  using button_release = xpp::x::event::button_release<connection&>;
-  using key_press = xpp::x::event::key_press<connection&>;
-  using key_release = xpp::x::event::key_release<connection&>;
-  using keymap_notify = xpp::x::event::keymap_notify<connection&>;
-
-  // }}}
-  // render events {{{
-
-  using circulate_notify = xpp::x::event::circulate_notify<connection&>;
-  using circulate_request = xpp::x::event::circulate_request<connection&>;
-  using colormap_notify = xpp::x::event::colormap_notify<connection&>;
-  using configure_notify = xpp::x::event::configure_notify<connection&>;
-  using configure_request = xpp::x::event::configure_request<connection&>;
-  using create_notify = xpp::x::event::create_notify<connection&>;
-  using destroy_notify = xpp::x::event::destroy_notify<connection&>;
-  using expose = xpp::x::event::expose<connection&>;
-  using graphics_exposure = xpp::x::event::graphics_exposure<connection&>;
-  using gravity_notify = xpp::x::event::gravity_notify<connection&>;
-  using map_notify = xpp::x::event::map_notify<connection&>;
-  using map_request = xpp::x::event::map_request<connection&>;
-  using mapping_notify = xpp::x::event::mapping_notify<connection&>;
-  using no_exposure = xpp::x::event::no_exposure<connection&>;
-  using reparent_notify = xpp::x::event::reparent_notify<connection&>;
-  using resize_request = xpp::x::event::resize_request<connection&>;
-  using unmap_notify = xpp::x::event::unmap_notify<connection&>;
-  using visibility_notify = xpp::x::event::visibility_notify<connection&>;
-
-  // }}}
-  // data events {{{
-
-  using client_message = xpp::x::event::client_message<connection&>;
-  using ge_generic = xpp::x::event::ge_generic<connection&>;
-  using property_notify = xpp::x::event::property_notify<connection&>;
-
-  // }}}
-  // selection events {{{
-
-  using selection_clear = xpp::x::event::selection_clear<connection&>;
-  using selection_notify = xpp::x::event::selection_notify<connection&>;
-  using selection_request = xpp::x::event::selection_request<connection&>;
-
-// }}}
-
-#ifdef ENABLE_RANDR_EXT
-  using randr_notify = xpp::randr::event::notify<connection&>;
-  using randr_screen_change_notify = xpp::randr::event::screen_change_notify<connection&>;
-#endif
-}
-
 POLYBAR_NS_END
diff --git a/include/x11/window.hpp b/include/x11/window.hpp
index fd098f10..b07acc75 100644
--- a/include/x11/window.hpp
+++ b/include/x11/window.hpp
@@ -32,133 +32,4 @@ class window : public xpp::window<connection_t&> {
   void redraw();
 };
 
-// struct cw_size {
-//   cw_size(uint16_t w, uint16_t h) : w(w), h(h){};
-//   uint16_t w;
-//   uint16_t h;
-// };
-// struct cw_pos {
-//   cw_pos(int16_t x, int16_t y) : x(x), y(y){};
-//   int16_t x;
-//   int16_t y;
-// };
-// struct cw_border {
-//   cw_border(uint16_t border_width) : border_width(border_width){};
-//   uint16_t border_width;
-// };
-// struct cw_class {
-//   cw_class(uint16_t class_) : class_(class_){};
-//   uint16_t class_;
-// };
-// struct cw_parent {
-//   cw_parent(xcb_window_t parent) : parent(parent){};
-//   xcb_window_t parent;
-// };
-// struct cw_depth {
-//   cw_depth(uint8_t depth) : depth(depth){};
-//   uint8_t depth;
-// };
-// struct cw_visual {
-//   cw_visual(xcb_visualid_t visualid) : visualid(visualid){};
-//   xcb_visualid_t visualid;
-// };
-// struct cw_mask {
-//   cw_mask(uint32_t mask) : mask(mask){};
-//   const uint32_t mask;
-// };
-// struct cw_params {
-//   cw_params(const xcb_params_cw_t* params) : params(params){};
-//   const xcb_params_cw_t* params;
-// };
-// struct cw_flush {
-//   cw_flush(bool checked = true) : checked(checked){};
-//   bool checked;
-// };
-
-// /**
-//  * Create X window
-//  *
-//  * Example usage:
-//  * @code cpp
-//  *   auto win = winspec()
-//  *     << cw_size(100, 200)
-//  *     << cw_pos(10, -20)
-//  *     << cw_border(9)
-//  *     << cw_class(XCB_WINDOW_CLASS_INPUT_ONLY)
-//  *     << cw_parent(0x000110a);
-//  *     << cw_flush(false);
-//  * @endcode
-//  */
-// class winspec {
-//  public:
-//   explicit winspec(connection& conn) : m_connection(conn) {}
-//
-//   winspec& operator<<(cw_size w) {
-//     m_width = w.w;
-//     m_height = w.h;
-//     return *this;
-//   }
-//   winspec& operator<<(cw_pos p) {
-//     m_x = p.x;
-//     m_y = p.y;
-//     return *this;
-//   }
-//   winspec& operator<<(cw_border b) {
-//     m_border = b.border_width;
-//     return *this;
-//   }
-//   winspec& operator<<(cw_class c) {
-//     m_class = c.class_;
-//     return *this;
-//   }
-//   winspec& operator<<(cw_parent p) {
-//     m_parent = p.parent;
-//     return *this;
-//   }
-//   winspec& operator<<(cw_depth d) {
-//     m_depth = d.depth;
-//     return *this;
-//   }
-//   winspec& operator<<(cw_visual v) {
-//     m_visual = v.visualid;
-//     return *this;
-//   }
-//   winspec& operator<<(cw_mask m) {
-//     m_mask = m.mask;
-//     return *this;
-//   }
-//   winspec& operator<<(cw_params p) {
-//     m_params = p.params;
-//     return *this;
-//   }
-//
-//   window operator<<(cw_flush f) {
-//     if (f.checked)
-//       m_connection.create_window_checked(m_depth, m_window, m_parent, m_x, m_y, m_width,
-//       m_height,
-//           m_border, m_class, m_visual, m_mask, m_params);
-//     else
-//       m_connection.create_window(m_depth, m_window, m_parent, m_x, m_y, m_width, m_height,
-//       m_border,
-//           m_class, m_visual, m_mask, m_params);
-//     return m_window;
-//   }
-//
-//  protected:
-//   connection& m_connection;
-//   window m_window{m_connection};
-//
-//   uint8_t m_depth;
-//   xcb_window_t m_parent;
-//   int16_t m_x;
-//   int16_t m_y;
-//   uint16_t m_width;
-//   uint16_t m_height;
-//   uint16_t m_border;
-//   uint16_t m_class;
-//   xcb_visualid_t m_visual;
-//   uint32_t m_mask;
-//   const xcb_params_cw_t* m_params;
-// };
-
 POLYBAR_NS_END
diff --git a/include/x11/winspec.hpp b/include/x11/winspec.hpp
new file mode 100644
index 00000000..68ef431e
--- /dev/null
+++ b/include/x11/winspec.hpp
@@ -0,0 +1,151 @@
+#pragma once
+
+#include "common.hpp"
+#include "x11/connection.hpp"
+
+POLYBAR_NS
+
+using connection_t = connection;
+
+struct cw_size {
+  cw_size(uint16_t w, uint16_t h) : w(w), h(h) {}
+  uint16_t w;
+  uint16_t h;
+};
+struct cw_pos {
+  cw_pos(int16_t x, int16_t y) : x(x), y(y) {}
+  int16_t x;
+  int16_t y;
+};
+struct cw_border {
+  cw_border(uint16_t border_width) : border_width(border_width) {}
+  uint16_t border_width;
+};
+struct cw_class {
+  cw_class(uint16_t class_) : class_(class_) {}
+  uint16_t class_;
+};
+struct cw_parent {
+  cw_parent(xcb_window_t parent) : parent(parent) {}
+  xcb_window_t parent;
+};
+struct cw_depth {
+  cw_depth(uint8_t depth) : depth(depth) {}
+  uint8_t depth;
+};
+struct cw_visual {
+  cw_visual(xcb_visualid_t visualid) : visualid(visualid) {}
+  xcb_visualid_t visualid;
+};
+struct cw_mask {
+  cw_mask(uint32_t mask) : mask(mask) {}
+  const uint32_t mask;
+};
+struct cw_params {
+  cw_params(const xcb_params_cw_t* params) : params(params) {}
+  const xcb_params_cw_t* params;
+};
+struct cw_flush {
+  cw_flush(bool checked = true) : checked(checked) {}
+  bool checked;
+};
+
+/**
+ * Create X window
+ *
+ * Example usage:
+ * @code cpp
+ *   auto win = winspec(conn)
+ *     << cw_size(100, 200)
+ *     << cw_pos(10, -20)
+ *     << cw_border(9)
+ *     << cw_class(XCB_WINDOW_CLASS_INPUT_ONLY)
+ *     << cw_parent(0x000110a);
+ *     << cw_flush(false);
+ * @endcode
+ */
+class winspec {
+ public:
+  explicit winspec(connection& conn, uint32_t id = XCB_NONE) : m_connection(conn), m_window(id) {}
+
+  explicit operator xcb_window_t() const {
+    return m_window;
+  }
+
+  explicit operator xcb_rectangle_t() const {
+    return {m_x, m_y, m_width, m_height};
+  }
+
+  winspec& operator<<(cw_size w) {
+    m_width = w.w;
+    m_height = w.h;
+    return *this;
+  }
+  winspec& operator<<(cw_pos p) {
+    m_x = p.x;
+    m_y = p.y;
+    return *this;
+  }
+  winspec& operator<<(cw_border b) {
+    m_border = b.border_width;
+    return *this;
+  }
+  winspec& operator<<(cw_class c) {
+    m_class = c.class_;
+    return *this;
+  }
+  winspec& operator<<(cw_parent p) {
+    m_parent = p.parent;
+    return *this;
+  }
+  winspec& operator<<(cw_depth d) {
+    m_depth = d.depth;
+    return *this;
+  }
+  winspec& operator<<(cw_visual v) {
+    m_visual = v.visualid;
+    return *this;
+  }
+  winspec& operator<<(cw_mask m) {
+    m_mask = m.mask;
+    return *this;
+  }
+  winspec& operator<<(cw_params p) {
+    m_params = p.params;
+    return *this;
+  }
+
+  xcb_window_t operator<<(cw_flush f) {
+    if (m_window == XCB_NONE) {
+      m_window = m_connection.generate_id();
+    }
+
+    if (f.checked) {
+      m_connection.create_window_checked(
+          m_depth, m_window, m_parent, m_x, m_y, m_width, m_height, m_border, m_class, m_visual, m_mask, m_params);
+    } else {
+      m_connection.create_window(
+          m_depth, m_window, m_parent, m_x, m_y, m_width, m_height, m_border, m_class, m_visual, m_mask, m_params);
+    }
+
+    return m_window;
+  }
+
+ protected:
+  connection& m_connection;
+  uint32_t m_window;
+
+  uint8_t m_depth;
+  xcb_window_t m_parent;
+  int16_t m_x;
+  int16_t m_y;
+  uint16_t m_width;
+  uint16_t m_height;
+  uint16_t m_border;
+  uint16_t m_class;
+  xcb_visualid_t m_visual;
+  uint32_t m_mask;
+  const xcb_params_cw_t* m_params;
+};
+
+POLYBAR_NS_END
diff --git a/include/x11/wm.hpp b/include/x11/wm.hpp
index 38c75a4d..ff4cc3fb 100644
--- a/include/x11/wm.hpp
+++ b/include/x11/wm.hpp
@@ -1,10 +1,13 @@
 #pragma once
 
+#include <xcb/xcb.h>
+
 #include "common.hpp"
-#include "x11/connection.hpp"
 
 POLYBAR_NS
 
+class connection;
+
 namespace wm_util {
   void set_wmname(connection& conn, xcb_window_t win, string wm_name, string wm_class);
   void set_wmprotocols(connection& conn, xcb_window_t win, vector<xcb_atom_t> flags);
diff --git a/include/x11/xresources.hpp b/include/x11/xresources.hpp
index cf8a0305..f7f3a963 100644
--- a/include/x11/xresources.hpp
+++ b/include/x11/xresources.hpp
@@ -22,15 +22,6 @@ class xresource_manager {
   XrmDatabase m_db;
 };
 
-namespace {
-  /**
-   * Configure injection module
-   */
-  template <typename T = const xresource_manager&>
-  di::injector<T> configure_xresource_manager() {
-    auto instance = factory::generic_singleton<xresource_manager>();
-    return di::make_injector(di::bind<>().to(instance));
-  }
-}
+di::injector<const xresource_manager&> configure_xresource_manager();
 
 POLYBAR_NS_END
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9eee1d4c..fcb1baea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,21 +1,15 @@
 #
-# Create library and executable
+# Create executable
 #
 
-set(BINARY_NAME ${PROJECT_NAME})
-set(LIBRARY_NAME lib${PROJECT_NAME})
-
-file(GLOB_RECURSE HEADERS RELATIVE ${PROJECT_SOURCE_DIR}/include *.h[p]*)
-file(GLOB_RECURSE SOURCES RELATIVE ${PROJECT_SOURCE_DIR}/src *.c[p]*)
-
-list(REMOVE_ITEM SOURCES main.cpp)
-
 configure_file(
   ${PROJECT_SOURCE_DIR}/include/config.hpp.cmake
   ${CMAKE_SOURCE_DIR}/include/config.hpp
   ESCAPE_QUOTES @ONLY)
 
-# Strip disabled libs {{{
+# Generate source tree {{{
+
+file(GLOB_RECURSE SOURCES RELATIVE ${PROJECT_SOURCE_DIR}/src *.c[p]*)
 
 if(NOT ENABLE_ALSA)
   list(REMOVE_ITEM SOURCES adapters/alsa.cpp modules/volume.cpp)
@@ -31,60 +25,26 @@ if(NOT ENABLE_I3)
 endif()
 
 # }}}
-
-# Target: main library {{{
-
-make_library(${LIBRARY_NAME} STATIC
-  HEADER_INSTALL_DIR
-    ${PROJECT_NAME}
-  HEADERS
-    ${HEADERS}
-  SOURCES
-    ${SOURCES})
-
-target_include_directories(${LIBRARY_NAME}_static PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-
-# }}}
-# Target: main executable {{{
-
-make_executable(${BINARY_NAME}
-  SOURCES main.cpp
-  TARGET_DEPENDS ${LIBRARY_NAME}_static)
-
-# }}}
-
-# Link dependencies {{{
+# Locate dependencies {{{
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
-
 find_package(Boost REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Freetype REQUIRED Freetype2)
 find_package(X11 REQUIRED COMPONENTS Xft Xutil)
 find_package(X11_XCB REQUIRED)
-
 find_package(PkgConfig)
 pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
 
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${BOOST_LIBRARIES})
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC Threads::Threads)
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${X11_LIBRARIES})
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${X11_X11_LIB})
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${X11_XCB_LIB})
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${X11_Xft_LIB})
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${FREETYPE_LIBRARIES})
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${FONTCONFIG_LIBRARIES})
+set(APP_LIBRARIES ${APP_LIBRARIES} ${BOOST_LIBRARIES})
+set(APP_LIBRARIES ${APP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+set(APP_LIBRARIES ${APP_LIBRARIES} ${X11_Xft_LIB})
 
-target_include_directories(${LIBRARY_NAME}_static PUBLIC ${BOOST_INCLUDE_DIR})
-target_include_directories(${LIBRARY_NAME}_static PUBLIC ${FONTCONFIG_INCLUDE_DIRS})
-target_include_directories(${LIBRARY_NAME}_static PUBLIC ${PROJECT_SOURCE_DIR}/include)
-target_include_directories(${LIBRARY_NAME}_static PUBLIC ${PROJECT_SOURCE_DIR}/lib/boost/include)
-target_include_directories(${LIBRARY_NAME}_static PUBLIC ${PROJECT_SOURCE_DIR}/lib/concurrentqueue/include)
-
-target_compile_definitions(${BINARY_NAME} PUBLIC
-    ${X11_XCB_DEFINITIONS}
-    ${XCB_DEFINITIONS})
+set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${BOOST_INCLUDE_DIR})
+set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${FONTCONFIG_INCLUDE_DIRS})
+set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/include)
+set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/lib/boost/include)
+set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/lib/concurrentqueue/include)
+set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 
 # xpp library
 set(XCB_PROTOS xproto)
@@ -98,15 +58,16 @@ if(ENABLE_DAMAGE_EXT)
   set(XCB_PROTOS "${XCB_PROTOS}" damage)
 endif()
 add_subdirectory(${PROJECT_SOURCE_DIR}/lib/xpp ${PROJECT_BINARY_DIR}/lib/xpp)
-target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${XPP_LIBRARIES})
+set(APP_LIBRARIES ${APP_LIBRARIES} ${XPP_LIBRARIES})
+set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${XPP_INCLUDE_DIRS})
 
 # }}}
-
 # Optional dependency: alsalib {{{
 
 if(ENABLE_ALSA)
   find_package(ALSA REQUIRED)
-  target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${ALSA_LIBRARY})
+  set(APP_LIBRARIES ${APP_LIBRARIES} ${ALSA_LIBRARY})
+  set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${ALSA_INCLUDE_DIR})
 endif()
 
 # }}}
@@ -114,7 +75,8 @@ endif()
 
 if(ENABLE_MPD)
   find_package(LibMPDClient REQUIRED)
-  target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${LIBMPDCLIENT_LIBRARIES})
+  set(APP_LIBRARIES ${APP_LIBRARIES} ${LIBMPDCLIENT_LIBRARY})
+  set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${LIBMPDCLIENT_INCLUDE_DIR})
 endif()
 
 # }}}
@@ -122,7 +84,8 @@ endif()
 
 if(ENABLE_NETWORK)
   find_package(Libiw REQUIRED)
-  target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${LIBIW_LIBRARY})
+  set(APP_LIBRARIES ${APP_LIBRARIES} ${LIBIW_LIBRARY})
+  set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${LIBIW_INCLUDE_DIR})
 endif()
 
 # }}}
@@ -130,21 +93,31 @@ endif()
 
 if(ENABLE_I3)
   add_subdirectory(${PROJECT_SOURCE_DIR}/lib/i3ipcpp ${PROJECT_BINARY_DIR}/lib/i3ipcpp)
-  target_include_directories(${LIBRARY_NAME}_static PUBLIC ${I3IPCPP_INCLUDE_DIRS})
-  target_link_libraries(${LIBRARY_NAME}_static PUBLIC ${I3IPCPP_LIBRARIES})
+  set(APP_LIBRARIES ${APP_LIBRARIES} ${I3IPCPP_LIBRARIES})
+  set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} ${I3IPCPP_INCLUDE_DIRS})
 endif()
 
 # }}}
+# Create executable target {{{
 
-# Export target details {{{
+make_executable(${PROJECT_NAME} SOURCES
+    ${SOURCES}
+  INCLUDE_DIRS
+    ${APP_INCLUDE_DIRS}
+  RAW_DEPENDS
+    ${APP_LIBRARIES})
 
-set(APP_BINARY ${PROJECT_SOURCE_DIR}/bin/${BINARY_NAME} PARENT_SCOPE)
-set(APP_LIBRARIES ${LIBRARY_NAME}_static ${XPP_LIBRARY} PARENT_SCOPE)
-set(APP_INCLUDE_DIRS
-  ${PROJECT_SOURCE_DIR}/include
-  ${PROJECT_SOURCE_DIR}/lib/boost/include
-  ${PROJECT_SOURCE_DIR}/lib/concurrentqueue/include
-  ${XPP_INCLUDE_DIRS}
-  PARENT_SCOPE)
+target_link_libraries(${PROJECT_NAME} Threads::Threads)
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC
+  ${X11_XCB_DEFINITIONS}
+  ${XCB_DEFINITIONS})
+
+# }}}
+# Export target details {{{
+
+set(APP_BINARY ${PROJECT_SOURCE_DIR}/bin/${PROJECT_NAME} PARENT_SCOPE)
+set(APP_LIBRARIES ${APP_LIBRARIES} PARENT_SCOPE)
+set(APP_INCLUDE_DIRS ${APP_INCLUDE_DIRS} PARENT_SCOPE)
 
 # }}}
diff --git a/src/adapters/alsa.cpp b/src/adapters/alsa.cpp
index 04257e61..222017b2 100644
--- a/src/adapters/alsa.cpp
+++ b/src/adapters/alsa.cpp
@@ -37,7 +37,7 @@ alsa_ctl_interface::alsa_ctl_interface(int numid) : m_numid(numid) {
 }
 
 alsa_ctl_interface::~alsa_ctl_interface() {
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
   snd_ctl_close(m_ctl);
   snd_hctl_close(m_hctl);
 }
@@ -49,7 +49,7 @@ int alsa_ctl_interface::get_numid() {
 bool alsa_ctl_interface::wait(int timeout) {
   assert(m_ctl);
 
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
 
   int err = 0;
 
@@ -73,7 +73,7 @@ bool alsa_ctl_interface::test_device_plugged() {
   assert(m_elem);
   assert(m_value);
 
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
 
   int err = 0;
   if ((err = snd_hctl_elem_read(m_elem, m_value)) < 0)
@@ -114,7 +114,7 @@ alsa_mixer::alsa_mixer(string mixer_control_name) : m_name(mixer_control_name) {
 }
 
 alsa_mixer::~alsa_mixer() {
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
   snd_mixer_elem_remove(m_mixerelement);
   snd_mixer_detach(m_hardwaremixer, ALSA_SOUNDCARD);
   snd_mixer_close(m_hardwaremixer);
@@ -127,7 +127,7 @@ string alsa_mixer::get_name() {
 bool alsa_mixer::wait(int timeout) {
   assert(m_hardwaremixer);
 
-  std::unique_lock<threading_util::spin_lock> guard(m_lock);
+  std::unique_lock<concurrency_util::spin_lock> guard(m_lock);
 
   int err = 0;
 
@@ -140,7 +140,7 @@ bool alsa_mixer::wait(int timeout) {
 }
 
 int alsa_mixer::process_events() {
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
 
   int num_events = snd_mixer_handle_events(m_hardwaremixer);
 
@@ -151,7 +151,7 @@ int alsa_mixer::process_events() {
 }
 
 int alsa_mixer::get_volume() {
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
   long chan_n = 0, vol_total = 0, vol, vol_min, vol_max;
 
   snd_mixer_selem_get_playback_volume_range(m_mixerelement, &vol_min, &vol_max);
@@ -170,7 +170,7 @@ int alsa_mixer::get_volume() {
 }
 
 int alsa_mixer::get_normalized_volume() {
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
   long chan_n = 0, vol_total = 0, vol, vol_min, vol_max;
   double normalized, min_norm;
 
@@ -202,7 +202,7 @@ void alsa_mixer::set_volume(float percentage) {
   if (is_muted())
     return;
 
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
 
   long vol_min, vol_max;
 
@@ -214,7 +214,7 @@ void alsa_mixer::set_normalized_volume(float percentage) {
   if (is_muted())
     return;
 
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
 
   long vol_min, vol_max;
   double min_norm;
@@ -236,19 +236,19 @@ void alsa_mixer::set_normalized_volume(float percentage) {
 }
 
 void alsa_mixer::set_mute(bool mode) {
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
   snd_mixer_selem_set_playback_switch_all(m_mixerelement, mode);
 }
 
 void alsa_mixer::toggle_mute() {
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
   int state;
   snd_mixer_selem_get_playback_switch(m_mixerelement, SND_MIXER_SCHN_MONO, &state);
   snd_mixer_selem_set_playback_switch_all(m_mixerelement, !state);
 }
 
 bool alsa_mixer::is_muted() {
-  std::lock_guard<threading_util::spin_lock> guard(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> guard(m_lock);
   int state = 0;
   for (int i = 0; i <= SND_MIXER_SCHN_LAST; i++) {
     if (snd_mixer_selem_has_playback_channel(
diff --git a/src/adapters/mpd.cpp b/src/adapters/mpd.cpp
index 51b8d0ff..ccb85b77 100644
--- a/src/adapters/mpd.cpp
+++ b/src/adapters/mpd.cpp
@@ -1,4 +1,7 @@
+#include <thread>
+
 #include "adapters/mpd.hpp"
+#include "components/logger.hpp"
 #include "utils/math.hpp"
 
 POLYBAR_NS
@@ -82,10 +85,13 @@ namespace mpd {
   // }}}
   // class: mpdconnection {{{
 
+  mpdconnection::mpdconnection(
+      const logger& logger, string host, unsigned int port, string password, unsigned int timeout)
+      : m_log(logger), m_host(host), m_port(port), m_password(password), m_timeout(timeout) {}
+
   void mpdconnection::connect() {
     try {
-      m_log.trace("mpdconnection.connect: %s, %i, \"%s\", timeout: %i", m_host, m_port, m_password,
-          m_timeout);
+      m_log.trace("mpdconnection.connect: %s, %i, \"%s\", timeout: %i", m_host, m_port, m_password, m_timeout);
       m_connection.reset(mpd_connection_new(m_host.c_str(), m_port, m_timeout * 1000));
       check_errors(m_connection.get());
 
@@ -127,7 +133,7 @@ namespace mpd {
       } catch (const mpd_exception& e) {
       }
 
-      this_thread::sleep_for(chrono::duration<double>(interval));
+      std::this_thread::sleep_for(chrono::duration<double>(interval));
     }
 
     return false;
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index c77ea196..3bda29dc 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -4,13 +4,14 @@
 #include "components/parser.hpp"
 #include "components/signals.hpp"
 #include "utils/bspwm.hpp"
-#include "x11/draw.hpp"
-#include "x11/graphics.hpp"
 #include "utils/color.hpp"
 #include "utils/math.hpp"
 #include "utils/string.hpp"
 #include "x11/draw.hpp"
-#include "x11/randr.hpp"
+#include "x11/draw.hpp"
+#include "x11/fonts.hpp"
+#include "x11/graphics.hpp"
+#include "x11/tray.hpp"
 #include "x11/wm.hpp"
 #include "x11/xlib.hpp"
 #include "x11/xutils.hpp"
@@ -21,11 +22,36 @@
 
 POLYBAR_NS
 
+/**
+ * Configure injection module
+ */
+di::injector<unique_ptr<bar>> configure_bar() {
+  // clang-format off
+  return di::make_injector(
+      configure_connection(),
+      configure_config(),
+      configure_logger(),
+      configure_font_manager(),
+      configure_tray_manager());
+  // clang-format on
+}
+
+/**
+ * Construct bar instance
+ */
+bar::bar(connection& conn, const config& config, const logger& logger, unique_ptr<font_manager> font_manager,
+    unique_ptr<tray_manager> tray_manager)
+    : m_connection(conn)
+    , m_conf(config)
+    , m_log(logger)
+    , m_fontmanager(forward<decltype(font_manager)>(font_manager))
+    , m_tray(forward<decltype(tray_manager)>(tray_manager)) {}
+
 /**
  * Cleanup signal handlers and destroy the bar window
  */
 bar::~bar() {
-  std::lock_guard<threading_util::spin_lock> lck(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> lck(m_lock);
 
   // Disconnect signal handlers {{{
   g_signals::parser::alignment_change = nullptr;
@@ -69,7 +95,7 @@ void bar::bootstrap(bool nodraw) {
   m_screensize.h = geom->height;
 
   // limit the amount of allowed input events to 1 per 60ms
-  m_throttler = throttle_util::make_throttler(1, 60ms);
+  m_throttler = throttle_util::make_throttler(1, chrono::milliseconds{60});
 
   m_opts.separator = string_util::trim(m_conf.get<string>(bs, "separator", ""), '"');
   m_opts.locale = m_conf.get<string>(bs, "locale", "");
@@ -345,14 +371,14 @@ const bar_settings bar::settings() const {
  * @param force Unless true, do not parse unchanged data
  */
 void bar::parse(string data, bool force) {
-  std::lock_guard<threading_util::spin_lock> lck(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> lck(m_lock);
   {
     if (data == m_prevdata && !force)
       return;
 
     m_prevdata = data;
 
-    // TODO: move to fontmanager
+    // TODO: move to font_manager
     m_xftdraw = XftDrawCreate(xlib::get_display(), m_pixmap, xlib::get_visual(), m_colormap);
 
     m_opts.align = alignment::LEFT;
@@ -760,7 +786,7 @@ void bar::handle(const evt::button_press& evt) {
     return;
   }
 
-  std::lock_guard<threading_util::spin_lock> lck(m_lock);
+  std::lock_guard<concurrency_util::spin_lock> lck(m_lock);
   {
     m_log.trace_x("bar: Received button press event: %i at pos(%i, %i)", static_cast<int>(evt->detail), evt->event_x,
         evt->event_y);
diff --git a/src/components/command_line.cpp b/src/components/command_line.cpp
index 5293b639..9e02ea81 100644
--- a/src/components/command_line.cpp
+++ b/src/components/command_line.cpp
@@ -1,5 +1,6 @@
 #include <iomanip>
 #include <iostream>
+#include <algorithm>
 
 #include "components/command_line.hpp"
 
diff --git a/src/components/config.cpp b/src/components/config.cpp
index 0813c336..fa0c79d2 100644
--- a/src/components/config.cpp
+++ b/src/components/config.cpp
@@ -1,5 +1,8 @@
+#include <algorithm>
+
 #include "components/config.hpp"
 #include "utils/file.hpp"
+#include "utils/env.hpp"
 
 POLYBAR_NS
 
@@ -25,10 +28,11 @@ void config::load(string file, string barname) {
   if (std::find(bars.begin(), bars.end(), m_current_bar) == bars.end())
     throw application_error("Undefined bar: " + m_current_bar);
 
-  if (has_env("XDG_CONFIG_HOME"))
-    file = string_util::replace(file, read_env("XDG_CONFIG_HOME"), "$XDG_CONFIG_HOME");
-  if (has_env("HOME"))
-    file = string_util::replace(file, read_env("HOME"), "~");
+  if (env_util::has("XDG_CONFIG_HOME"))
+    file = string_util::replace(file, env_util::get("XDG_CONFIG_HOME"), "$XDG_CONFIG_HOME");
+  if (env_util::has("HOME"))
+    file = string_util::replace(file, env_util::get("HOME"), "~");
+
   m_logger.trace("config: Loaded %s", file);
   m_logger.trace("config: Current bar section: [%s]", bar_section());
 }
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index 609eec53..c7ffdd72 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -1,6 +1,10 @@
+#include <chrono>
 #include <csignal>
 #include <mutex>
 
+#include "x11/color.hpp"
+#include "components/bar.hpp"
+
 #include "components/controller.hpp"
 
 #include "modules/backlight.hpp"
@@ -20,7 +24,6 @@
 #include "modules/xbacklight.hpp"
 #include "modules/xwindow.hpp"
 
-#include "components/bar.hpp"
 #include "components/config.hpp"
 #include "components/eventloop.hpp"
 #include "components/ipc.hpp"
@@ -46,6 +49,23 @@ POLYBAR_NS
 
 using namespace modules;
 
+namespace chrono = std::chrono;
+
+/**
+ * Configure injection module
+ */
+di::injector<unique_ptr<controller>> configure_controller(watch_t& confwatch) {
+  // clang-format off
+  return di::make_injector(
+      di::bind<>().to(confwatch),
+      configure_connection(),
+      configure_logger(),
+      configure_config(),
+      configure_eventloop(),
+      configure_bar());
+  // clang-format on
+}
+
 /**
  * Stop modules and cleanup X components,
  * threads and spawned processes
@@ -231,7 +251,7 @@ void controller::install_confwatch() {
   }
 
   m_threads.emplace_back([this] {
-    this_thread::sleep_for(1s);
+    this_thread::sleep_for(chrono::seconds{1});
 
     try {
       if (!m_running)
@@ -396,7 +416,7 @@ void controller::bootstrap_modules() {
             throw application_error("Inter-process messaging needs to be enabled");
           module.reset(new ipc_module(bar, m_log, m_conf, module_name));
           m_ipc->attach_callback(
-              bind(&ipc_module::on_message, dynamic_cast<ipc_module*>(module.get()), placeholders::_1));
+              bind(&ipc_module::on_message, static_cast<ipc_module*>(module.get()), placeholders::_1));
         } else
           throw application_error("Unknown module: " + module_name);
 
diff --git a/src/components/eventloop.cpp b/src/components/eventloop.cpp
index 3508e250..4d0bcc8c 100644
--- a/src/components/eventloop.cpp
+++ b/src/components/eventloop.cpp
@@ -1,5 +1,8 @@
 #include "components/eventloop.hpp"
+#include "components/types.hpp"
 #include "utils/string.hpp"
+#include "utils/time.hpp"
+#include "x11/color.hpp"
 
 POLYBAR_NS
 
@@ -10,7 +13,7 @@ eventloop::~eventloop() noexcept {
   for (auto&& block : m_modules) {
     for (auto&& module : block.second) {
       auto module_name = module->name();
-      auto cleanup_ms = time_execution([&module] {
+      auto cleanup_ms = time_util::measure([&module] {
         module->stop();
         module.reset();
       });
@@ -38,7 +41,7 @@ bool eventloop::enqueue(const entry_t& i) {
  * @param timeframe Time to wait for subsequent events
  * @param limit Maximum amount of subsequent events to swallow within timeframe
  */
-void eventloop::run(chrono::duration<double, std::milli> timeframe, int limit) {
+void eventloop::run(std::chrono::duration<double, std::milli> timeframe, int limit) {
   m_log.info("Starting event loop", timeframe.count(), limit);
   m_running = true;
 
diff --git a/src/components/ipc.cpp b/src/components/ipc.cpp
index 9992c357..5a3122b1 100644
--- a/src/components/ipc.cpp
+++ b/src/components/ipc.cpp
@@ -1,5 +1,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "components/ipc.hpp"
 #include "config.hpp"
diff --git a/src/components/logger.cpp b/src/components/logger.cpp
index 3c2b835f..092cacde 100644
--- a/src/components/logger.cpp
+++ b/src/components/logger.cpp
@@ -1,3 +1,5 @@
+#include <unistd.h>
+
 #include "components/logger.hpp"
 #include "utils/string.hpp"
 
diff --git a/src/components/parser.cpp b/src/components/parser.cpp
index e2075a94..706e05ab 100644
--- a/src/components/parser.cpp
+++ b/src/components/parser.cpp
@@ -1,3 +1,6 @@
+#include "x11/color.hpp"
+#include "components/types.hpp"
+
 #include "components/parser.hpp"
 #include "utils/math.hpp"
 #include "utils/string.hpp"
diff --git a/src/components/signals.cpp b/src/components/signals.cpp
index 0b986230..73725100 100644
--- a/src/components/signals.cpp
+++ b/src/components/signals.cpp
@@ -1,32 +1,33 @@
 #include "components/signals.hpp"
+#include "components/types.hpp"
 
 POLYBAR_NS
 
 /**
  * Signals used to communicate with the bar window
  */
-callback<string> g_signals::bar::action_click = nullptr;
-callback<bool> g_signals::bar::visibility_change = nullptr;
+callback<string> g_signals::bar::action_click{nullptr};
+callback<bool> g_signals::bar::visibility_change{nullptr};
 
 /**
  * Signals used to communicate with the input parser
  */
-callback<alignment> g_signals::parser::alignment_change = nullptr;
-callback<attribute> g_signals::parser::attribute_set = nullptr;
-callback<attribute> g_signals::parser::attribute_unset = nullptr;
-callback<attribute> g_signals::parser::attribute_toggle = nullptr;
-callback<mousebtn, string> g_signals::parser::action_block_open = nullptr;
-callback<mousebtn> g_signals::parser::action_block_close = nullptr;
-callback<gc, color> g_signals::parser::color_change = nullptr;
-callback<int> g_signals::parser::font_change = nullptr;
-callback<int> g_signals::parser::pixel_offset = nullptr;
-callback<uint16_t> g_signals::parser::ascii_text_write = nullptr;
-callback<uint16_t> g_signals::parser::unicode_text_write = nullptr;
-callback<const char*, size_t> g_signals::parser::string_write = nullptr;
+callback<alignment> g_signals::parser::alignment_change{nullptr};
+callback<attribute> g_signals::parser::attribute_set{nullptr};
+callback<attribute> g_signals::parser::attribute_unset{nullptr};
+callback<attribute> g_signals::parser::attribute_toggle{nullptr};
+callback<mousebtn, string> g_signals::parser::action_block_open{nullptr};
+callback<mousebtn> g_signals::parser::action_block_close{nullptr};
+callback<gc, color> g_signals::parser::color_change{nullptr};
+callback<int> g_signals::parser::font_change{nullptr};
+callback<int> g_signals::parser::pixel_offset{nullptr};
+callback<uint16_t> g_signals::parser::ascii_text_write{nullptr};
+callback<uint16_t> g_signals::parser::unicode_text_write{nullptr};
+callback<const char*, size_t> g_signals::parser::string_write{nullptr};
 
 /**
  * Signals used to communicate with the tray manager
  */
-callback<uint16_t> g_signals::tray::report_slotcount = nullptr;
+callback<uint16_t> g_signals::tray::report_slotcount{nullptr};
 
 POLYBAR_NS_END
diff --git a/src/drawtypes/progressbar.cpp b/src/drawtypes/progressbar.cpp
index 48e401e3..398e7b90 100644
--- a/src/drawtypes/progressbar.cpp
+++ b/src/drawtypes/progressbar.cpp
@@ -1,3 +1,6 @@
+#include "x11/color.hpp"
+#include "components/types.hpp"
+
 #include "drawtypes/progressbar.hpp"
 #include "utils/math.hpp"
 
diff --git a/src/main.cpp b/src/main.cpp
index e0bb10a7..8518ec62 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,13 +1,16 @@
 #include <X11/Xlib-xcb.h>
 
 #include "common.hpp"
+
+#include "components/bar.hpp"
 #include "components/command_line.hpp"
 #include "components/config.hpp"
 #include "components/controller.hpp"
 #include "components/logger.hpp"
-#include "x11/xutils.hpp"
 #include "config.hpp"
+#include "utils/env.hpp"
 #include "utils/inotify.hpp"
+#include "x11/xutils.hpp"
 
 using namespace polybar;
 
@@ -67,7 +70,7 @@ int main(int argc, char** argv) {
         cli.usage();
         return EXIT_SUCCESS;
       } else if (cli.has("version")) {
-        print_build_info();
+        print_build_info(version_details(args));
         return EXIT_SUCCESS;
       } else if (args.empty() || args[0][0] == '-') {
         cli.usage();
@@ -81,10 +84,10 @@ int main(int argc, char** argv) {
 
       if (cli.has("config"))
         conf.load(cli.get("config"), args[0]);
-      else if (has_env("XDG_CONFIG_HOME"))
-        conf.load(read_env("XDG_CONFIG_HOME") + "/polybar/config", args[0]);
-      else if (has_env("HOME"))
-        conf.load(read_env("HOME") + "/.config/polybar/config", args[0]);
+      else if (env_util::has("XDG_CONFIG_HOME"))
+        conf.load(env_util::get("XDG_CONFIG_HOME") + "/polybar/config", args[0]);
+      else if (env_util::has("HOME"))
+        conf.load(env_util::get("HOME") + "/.config/polybar/config", args[0]);
       else
         throw application_error("Define configuration using --config=PATH");
 
diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp
index 3fe68399..50954d78 100644
--- a/src/modules/backlight.cpp
+++ b/src/modules/backlight.cpp
@@ -1,12 +1,19 @@
 #include "modules/backlight.hpp"
+
 #include "drawtypes/label.hpp"
 #include "drawtypes/progressbar.hpp"
 #include "drawtypes/ramp.hpp"
 #include "utils/file.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/inotify_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<backlight_module>;
+  template class inotify_module<backlight_module>;
+
   void brightness_handle::filepath(string path) {
     if (!file_util::exists(path))
       throw module_error("The file '" + path + "' does not exist");
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 70510d46..89e190c0 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -1,14 +1,22 @@
 #include "modules/battery.hpp"
+
 #include "drawtypes/animation.hpp"
 #include "drawtypes/label.hpp"
 #include "drawtypes/progressbar.hpp"
 #include "drawtypes/ramp.hpp"
+
 #include "utils/file.hpp"
 #include "utils/math.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/inotify_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<battery_module>;
+  template class inotify_module<battery_module>;
+
   /**
    * Bootstrap module by setting up required components
    */
@@ -30,7 +38,7 @@ namespace modules {
     }
 
     m_fullat = m_conf.get<int>(name(), "full-at", 100);
-    m_interval = interval_t{m_conf.get<float>(name(), "poll-interval", 5.0f)};
+    m_interval = chrono::duration<double>{m_conf.get<float>(name(), "poll-interval", 5.0f)};
     m_lastpoll = chrono::system_clock::now();
 
     // Load state and capacity level
diff --git a/src/modules/bspwm.cpp b/src/modules/bspwm.cpp
index 35de8068..d724dac4 100644
--- a/src/modules/bspwm.cpp
+++ b/src/modules/bspwm.cpp
@@ -5,9 +5,15 @@
 #include "drawtypes/iconset.hpp"
 #include "drawtypes/label.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/event_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<bspwm_module>;
+  template class event_module<bspwm_module>;
+
   void bspwm_module::setup() {  // {{{
     // Create ipc subscriber
     m_subscriber = bspwm_util::make_subscriber();
diff --git a/src/modules/counter.cpp b/src/modules/counter.cpp
index 36d0903c..7036d3c2 100644
--- a/src/modules/counter.cpp
+++ b/src/modules/counter.cpp
@@ -1,8 +1,14 @@
 #include "modules/counter.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/timer_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<counter_module>;
+  template class timer_module<counter_module>;
+
   void counter_module::setup() {
     m_interval = chrono::duration<double>(m_conf.get<float>(name(), "interval", 1));
     m_formatter->add(DEFAULT_FORMAT, TAG_COUNTER, {TAG_COUNTER});
diff --git a/src/modules/cpu.cpp b/src/modules/cpu.cpp
index 31e166dc..7524159a 100644
--- a/src/modules/cpu.cpp
+++ b/src/modules/cpu.cpp
@@ -1,12 +1,19 @@
 #include "modules/cpu.hpp"
+
 #include "drawtypes/label.hpp"
 #include "drawtypes/progressbar.hpp"
 #include "drawtypes/ramp.hpp"
 #include "utils/math.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/timer_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<cpu_module>;
+  template class timer_module<cpu_module>;
+
   void cpu_module::setup() {
     m_interval = chrono::duration<double>(m_conf.get<float>(name(), "interval", 1));
 
diff --git a/src/modules/date.cpp b/src/modules/date.cpp
index 4df026ba..e7c2bbcb 100644
--- a/src/modules/date.cpp
+++ b/src/modules/date.cpp
@@ -1,8 +1,14 @@
 #include "modules/date.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/timer_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<date_module>;
+  template class timer_module<date_module>;
+
   void date_module::setup() {
     if (!m_bar.locale.empty())
       setlocale(LC_TIME, m_bar.locale.c_str());
diff --git a/src/modules/fs.cpp b/src/modules/fs.cpp
index 106cefa6..3e0e9e09 100644
--- a/src/modules/fs.cpp
+++ b/src/modules/fs.cpp
@@ -1,16 +1,23 @@
 #include <sys/statvfs.h>
 
+#include "modules/fs.hpp"
+
 #include "drawtypes/label.hpp"
 #include "drawtypes/progressbar.hpp"
 #include "drawtypes/ramp.hpp"
-#include "modules/fs.hpp"
 #include "utils/math.hpp"
 #include "utils/mtab.hpp"
 #include "utils/string.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/timer_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<fs_module>;
+  template class timer_module<fs_module>;
+
   /**
    * Bootstrap the module by reading config values and
    * setting up required components
diff --git a/src/modules/i3.cpp b/src/modules/i3.cpp
index 5b38bbcb..218d85cd 100644
--- a/src/modules/i3.cpp
+++ b/src/modules/i3.cpp
@@ -5,9 +5,15 @@
 #include "drawtypes/iconset.hpp"
 #include "drawtypes/label.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/event_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<i3_module>;
+  template class event_module<i3_module>;
+
   i3_workspace::operator bool() {
     return label && *label;
   }
diff --git a/src/modules/ipc.cpp b/src/modules/ipc.cpp
index 6d8f0f02..969be120 100644
--- a/src/modules/ipc.cpp
+++ b/src/modules/ipc.cpp
@@ -1,9 +1,16 @@
 #include "modules/ipc.hpp"
+
 #include "components/ipc.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/static_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<ipc_module>;
+  template class static_module<ipc_module>;
+
   /**
    * Load user-defined ipc hooks and
    * create formatting tags
diff --git a/src/modules/memory.cpp b/src/modules/memory.cpp
index 1b033d1c..eb5cfb74 100644
--- a/src/modules/memory.cpp
+++ b/src/modules/memory.cpp
@@ -1,10 +1,17 @@
 #include "modules/memory.hpp"
+
 #include "drawtypes/label.hpp"
 #include "drawtypes/progressbar.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/timer_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<memory_module>;
+  template class timer_module<memory_module>;
+
   void memory_module::setup() {
     m_interval = chrono::duration<double>(m_conf.get<float>(name(), "interval", 1));
 
diff --git a/src/modules/menu.cpp b/src/modules/menu.cpp
index 1fa1bbda..4b997db8 100644
--- a/src/modules/menu.cpp
+++ b/src/modules/menu.cpp
@@ -3,9 +3,15 @@
 #include "drawtypes/label.hpp"
 #include "utils/scope.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/static_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<menu_module>;
+  template class static_module<menu_module>;
+
   void menu_module::setup() {
     string default_format{TAG_LABEL_TOGGLE + string{" "} + TAG_MENU};
 
diff --git a/src/modules/meta/base.cpp b/src/modules/meta/base.cpp
new file mode 100644
index 00000000..88426b5b
--- /dev/null
+++ b/src/modules/meta/base.cpp
@@ -0,0 +1,97 @@
+#include "components/builder.hpp"
+#include "modules/meta/base.hpp"
+
+POLYBAR_NS
+
+namespace modules {
+  // module_format {{{
+
+  string module_format::decorate(builder* builder, string output) {
+    if (offset != 0)
+      builder->offset(offset);
+    if (margin > 0)
+      builder->space(margin);
+    if (!bg.empty())
+      builder->background(bg);
+    if (!fg.empty())
+      builder->color(fg);
+    if (!ul.empty())
+      builder->underline(ul);
+    if (!ol.empty())
+      builder->overline(ol);
+    if (padding > 0)
+      builder->space(padding);
+
+    builder->append(output);
+
+    if (padding > 0)
+      builder->space(padding);
+    if (!ol.empty())
+      builder->overline_close();
+    if (!ul.empty())
+      builder->underline_close();
+    if (!fg.empty())
+      builder->color_close();
+    if (!bg.empty())
+      builder->background_close();
+    if (margin > 0)
+      builder->space(margin);
+
+    return builder->flush();
+  }
+
+  // }}}
+  // module_formatter {{{
+
+  void module_formatter::add(string name, string fallback, vector<string>&& tags, vector<string>&& whitelist) {
+    auto format = make_unique<module_format>();
+
+    format->value = m_conf.get<string>(m_modname, name, fallback);
+    format->fg = m_conf.get<string>(m_modname, name + "-foreground", "");
+    format->bg = m_conf.get<string>(m_modname, name + "-background", "");
+    format->ul = m_conf.get<string>(m_modname, name + "-underline", "");
+    format->ol = m_conf.get<string>(m_modname, name + "-overline", "");
+    format->spacing = m_conf.get<int>(m_modname, name + "-spacing", DEFAULT_SPACING);
+    format->padding = m_conf.get<int>(m_modname, name + "-padding", 0);
+    format->margin = m_conf.get<int>(m_modname, name + "-margin", 0);
+    format->offset = m_conf.get<int>(m_modname, name + "-offset", 0);
+    format->tags.swap(tags);
+
+    for (auto&& tag : string_util::split(format->value, ' ')) {
+      if (tag[0] != '<' || tag[tag.length() - 1] != '>')
+        continue;
+      if (find(format->tags.begin(), format->tags.end(), tag) != format->tags.end())
+        continue;
+      if (find(whitelist.begin(), whitelist.end(), tag) != whitelist.end())
+        continue;
+      throw undefined_format_tag("[" + m_modname + "] Undefined \"" + name + "\" tag: " + tag);
+    }
+
+    m_formats.insert(make_pair(name, move(format)));
+  }
+
+  bool module_formatter::has(string tag, string format_name) {
+    auto format = m_formats.find(format_name);
+    if (format == m_formats.end())
+      throw undefined_format(format_name.c_str());
+    return format->second->value.find(tag) != string::npos;
+  }
+
+  bool module_formatter::has(string tag) {
+    for (auto&& format : m_formats)
+      if (format.second->value.find(tag) != string::npos)
+        return true;
+    return false;
+  }
+
+  shared_ptr<module_format> module_formatter::get(string format_name) {
+    auto format = m_formats.find(format_name);
+    if (format == m_formats.end())
+      throw undefined_format("Format \"" + format_name + "\" has not been added");
+    return format->second;
+  }
+
+  // }}}
+}
+
+POLYBAR_NS_END
diff --git a/src/modules/meta/inotify_module.cpp b/src/modules/meta/inotify_module.cpp
new file mode 100644
index 00000000..d64e0fba
--- /dev/null
+++ b/src/modules/meta/inotify_module.cpp
@@ -0,0 +1,104 @@
+#include "modules/meta/inotify_module.hpp"
+
+#include "modules/backlight.hpp"
+#include "modules/battery.hpp"
+
+POLYBAR_NS
+
+namespace modules {
+  // public {{{
+
+  template <class Impl>
+  void inotify_module<Impl>::start() {
+    CAST_MOD(Impl)->m_mainthread = thread(&inotify_module::runner, this);
+  }
+
+  // }}}
+  // protected {{{
+
+  template <class Impl>
+  void inotify_module<Impl>::runner() {
+    try {
+      // Send initial broadcast to warmup cache
+      if (CONST_MOD(Impl).running()) {
+        CAST_MOD(Impl)->on_event(nullptr);
+        CAST_MOD(Impl)->broadcast();
+      }
+
+      while (CONST_MOD(Impl).running()) {
+        CAST_MOD(Impl)->poll_events();
+      }
+    } catch (const module_error& err) {
+      CAST_MOD(Impl)->halt(err.what());
+    } catch (const std::exception& err) {
+      CAST_MOD(Impl)->halt(err.what());
+    }
+  }
+
+  template <class Impl>
+  void inotify_module<Impl>::watch(string path, int mask) {
+    this->m_log.trace("%s: Attach inotify at %s", CONST_MOD(Impl).name(), path);
+    m_watchlist.insert(make_pair(path, mask));
+  }
+
+  template <class Impl>
+  void inotify_module<Impl>::idle() {
+    CAST_MOD(Impl)->sleep(200ms);
+  }
+
+  template <class Impl>
+  void inotify_module<Impl>::poll_events() {
+    vector<inotify_util::watch_t> watches;
+
+    try {
+      for (auto&& w : m_watchlist) {
+        watches.emplace_back(inotify_util::make_watch(w.first));
+        watches.back()->attach(w.second);
+      }
+    } catch (const system_error& e) {
+      watches.clear();
+      this->m_log.err("%s: Error while creating inotify watch (what: %s)", CONST_MOD(Impl).name(), e.what());
+      CAST_MOD(Impl)->sleep(0.1s);
+      return;
+    }
+
+    while (CONST_MOD(Impl).running()) {
+      std::unique_lock<concurrency_util::spin_lock> guard(this->m_lock);
+      {
+        for (auto&& w : watches) {
+          this->m_log.trace_x("%s: Poll inotify watch %s", CONST_MOD(Impl).name(), w->path());
+
+          if (w->poll(1000 / watches.size())) {
+            auto event = w->get_event();
+
+            for (auto&& w : watches) {
+              try {
+                w->remove();
+              } catch (const system_error&) {
+              }
+            }
+
+            if (CAST_MOD(Impl)->on_event(event.get()))
+              CAST_MOD(Impl)->broadcast();
+
+            CAST_MOD(Impl)->idle();
+
+            return;
+          }
+
+          if (!CONST_MOD(Impl).running())
+            break;
+        }
+      }
+      guard.unlock();
+      CAST_MOD(Impl)->idle();
+    }
+  }
+
+  // }}}
+
+  template class inotify_module<backlight_module>;
+  template class inotify_module<battery_module>;
+}
+
+POLYBAR_NS_END
diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp
index cc7c3028..afa3d9c9 100644
--- a/src/modules/mpd.cpp
+++ b/src/modules/mpd.cpp
@@ -4,11 +4,17 @@
 #include "drawtypes/label.hpp"
 #include "drawtypes/progressbar.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/event_module.inl"
+
 POLYBAR_NS
 
 using namespace mpd;
 
 namespace modules {
+  template class module<mpd_module>;
+  template class event_module<mpd_module>;
+
   void mpd_module::setup() {
     m_host = m_conf.get<string>(name(), "host", m_host);
     m_port = m_conf.get<unsigned int>(name(), "port", m_port);
diff --git a/src/modules/network.cpp b/src/modules/network.cpp
index 535522d1..d0ac21c1 100644
--- a/src/modules/network.cpp
+++ b/src/modules/network.cpp
@@ -4,9 +4,15 @@
 #include "drawtypes/label.hpp"
 #include "drawtypes/ramp.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/timer_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<network_module>;
+  template class timer_module<network_module>;
+
   void network_module::setup() {
     // Load configuration values
     REQ_CONFIG_VALUE(name(), m_interface, "interface");
@@ -69,8 +75,8 @@ namespace modules {
   }
 
   bool network_module::update() {
-    net::network* network = m_wireless ? dynamic_cast<net::network*>(m_wireless.get())
-                                       : dynamic_cast<net::network*>(m_wired.get());
+    net::network* network = m_wireless ? static_cast<net::network*>(m_wireless.get())
+                                       : static_cast<net::network*>(m_wired.get());
 
     if (!network->query(m_accumulate)) {
       m_log.warn("%s: Failed to query interface '%s'", name(), m_interface);
diff --git a/src/modules/script.cpp b/src/modules/script.cpp
index d37d349c..8c9ad71e 100644
--- a/src/modules/script.cpp
+++ b/src/modules/script.cpp
@@ -1,8 +1,14 @@
 #include "modules/script.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/event_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<script_module>;
+  template class event_module<script_module>;
+
   void script_module::setup() {
     m_formatter->add(DEFAULT_FORMAT, TAG_OUTPUT, {TAG_OUTPUT});
 
@@ -19,7 +25,7 @@ namespace modules {
     m_actions[mousebtn::SCROLL_UP] = m_conf.get<string>(name(), "scroll-up", "");
     m_actions[mousebtn::SCROLL_DOWN] = m_conf.get<string>(name(), "scroll-down", "");
 
-    m_interval = interval_t{m_conf.get<float>(name(), "interval", m_tail ? 0.0f : 2.0f)};
+    m_interval = chrono::duration<double>{m_conf.get<float>(name(), "interval", m_tail ? 0.0f : 2.0f)};
   }
 
   void script_module::stop() {
diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index ca45d9f0..57bd14fa 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -5,9 +5,15 @@
 #include "utils/file.hpp"
 #include "utils/math.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/timer_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<temperature_module>;
+  template class timer_module<temperature_module>;
+
   void temperature_module::setup() {
     m_zone = m_conf.get<int>(name(), "thermal-zone", 0);
     m_tempwarn = m_conf.get<int>(name(), "warn-temperature", 80);
diff --git a/src/modules/text.cpp b/src/modules/text.cpp
index e742f787..3489ff3e 100644
--- a/src/modules/text.cpp
+++ b/src/modules/text.cpp
@@ -1,8 +1,14 @@
 #include "modules/text.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/static_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<text_module>;
+  template class static_module<text_module>;
+
   void text_module::setup() {
     m_formatter->add("content", "", {});
 
diff --git a/src/modules/volume.cpp b/src/modules/volume.cpp
index 10f88ddb..c0bcc54f 100644
--- a/src/modules/volume.cpp
+++ b/src/modules/volume.cpp
@@ -5,12 +5,17 @@
 #include "drawtypes/ramp.hpp"
 #include "utils/math.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/event_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
-  void volume_module::setup() {
-    // Load configuration values {{{
+  template class module<volume_module>;
+  template class event_module<volume_module>;
 
+  void volume_module::setup() {
+    // Load configuration values
     string master_mixer_name{"Master"};
     string speaker_mixer_name;
     string headphone_mixer_name;
@@ -18,7 +23,7 @@ namespace modules {
     GET_CONFIG_VALUE(name(), master_mixer_name, "master-mixer");
     GET_CONFIG_VALUE(name(), speaker_mixer_name, "speaker-mixer");
     GET_CONFIG_VALUE(name(), headphone_mixer_name, "headphone-mixer");
-    m_mapped = m_conf.get<bool>(name(), "mapped", false);
+    GET_CONFIG_VALUE(name(), m_mapped, "mapped");
 
     if (!headphone_mixer_name.empty())
       REQ_CONFIG_VALUE(name(), m_headphoneid, "headphone-id");
@@ -28,9 +33,7 @@ namespace modules {
     if (string_util::compare(headphone_mixer_name, "master"))
       throw module_error("Master mixer is already defined");
 
-    // }}}
-    // Setup mixers {{{
-
+    // Setup mixers
     try {
       if (!master_mixer_name.empty())
         m_mixers[mixer::MASTER].reset(new mixer_t::element_type{master_mixer_name});
@@ -48,9 +51,7 @@ namespace modules {
       throw module_error(err.what());
     }
 
-    // }}}
-    // Add formats and elements {{{
-
+    // Add formats and elements
     m_formatter->add(
         FORMAT_VOLUME, TAG_LABEL_VOLUME, {TAG_RAMP_VOLUME, TAG_LABEL_VOLUME, TAG_BAR_VOLUME});
     m_formatter->add(
@@ -66,8 +67,6 @@ namespace modules {
       m_ramp_volume = load_ramp(m_conf, name(), TAG_RAMP_VOLUME);
       m_ramp_headphones = load_ramp(m_conf, name(), TAG_RAMP_HEADPHONES, false);
     }
-
-    // }}}
   }
 
   void volume_module::teardown() {
@@ -75,8 +74,7 @@ namespace modules {
   }
 
   bool volume_module::has_event() {
-    // Poll for mixer and control events {{{
-
+    // Poll for mixer and control events
     try {
       if (m_mixers[mixer::MASTER] && m_mixers[mixer::MASTER]->wait(25))
         return true;
@@ -91,13 +89,10 @@ namespace modules {
     }
 
     return false;
-
-    // }}}
   }
 
   bool volume_module::update() {
-    // Consume pending events {{{
-
+    // Consume pending events
     if (m_mixers[mixer::MASTER])
       m_mixers[mixer::MASTER]->process_events();
     if (m_mixers[mixer::SPEAKER])
@@ -107,9 +102,7 @@ namespace modules {
     if (m_controls[control::HEADPHONE])
       m_controls[control::HEADPHONE]->process_events();
 
-    // }}}
-    // Get volume, mute and headphone state {{{
-
+    // Get volume, mute and headphone state
     m_volume = 100;
     m_muted = false;
     m_headphones = false;
@@ -131,9 +124,7 @@ namespace modules {
       m_muted = m_muted || m_mixers[mixer::SPEAKER]->is_muted();
     }
 
-    // }}}
-    // Replace label tokens {{{
-
+    // Replace label tokens
     if (m_label_volume) {
       m_label_volume->reset_tokens();
       m_label_volume->replace_token("%percentage%", to_string(m_volume) + "%");
@@ -144,8 +135,6 @@ namespace modules {
       m_label_muted->replace_token("%percentage%", to_string(m_volume) + "%");
     }
 
-    // }}}
-
     return true;
   }
 
diff --git a/src/modules/xbacklight.cpp b/src/modules/xbacklight.cpp
index d65a91d9..90888f31 100644
--- a/src/modules/xbacklight.cpp
+++ b/src/modules/xbacklight.cpp
@@ -1,14 +1,27 @@
 #include "modules/xbacklight.hpp"
-
 #include "drawtypes/label.hpp"
 #include "drawtypes/progressbar.hpp"
 #include "drawtypes/ramp.hpp"
 #include "utils/math.hpp"
+#include "x11/connection.hpp"
 #include "x11/graphics.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/static_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<xbacklight_module>;
+  template class static_module<xbacklight_module>;
+
+  /**
+   * Construct module
+   */
+  xbacklight_module::xbacklight_module(const bar_settings bar, const logger& logger, const config& config, string name)
+      : static_module<xbacklight_module>(bar, logger, config, name)
+      , m_connection(configure_connection().create<connection&>()) {}
+
   /**
    * Bootstrap the module by grabbing all required components
    */
diff --git a/src/modules/xwindow.cpp b/src/modules/xwindow.cpp
index 12f823cc..f3af2314 100644
--- a/src/modules/xwindow.cpp
+++ b/src/modules/xwindow.cpp
@@ -1,12 +1,18 @@
 #include "modules/xwindow.hpp"
-
 #include "drawtypes/label.hpp"
 #include "x11/atoms.hpp"
+#include "x11/connection.hpp"
 #include "x11/graphics.hpp"
 
+#include "modules/meta/base.inl"
+#include "modules/meta/static_module.inl"
+
 POLYBAR_NS
 
 namespace modules {
+  template class module<xwindow_module>;
+  template class static_module<xwindow_module>;
+
   /**
    * Bootstrap the module
    */
diff --git a/src/utils/bspwm.cpp b/src/utils/bspwm.cpp
index 9c2921d1..355af18a 100644
--- a/src/utils/bspwm.cpp
+++ b/src/utils/bspwm.cpp
@@ -1,6 +1,7 @@
 #include <sys/un.h>
 
 #include "utils/bspwm.hpp"
+#include "utils/env.hpp"
 
 POLYBAR_NS
 
@@ -67,7 +68,7 @@ namespace bspwm_util {
   string get_socket_path() {
     string env_path;
 
-    if ((env_path = read_env("BSPWM_SOCKET")).empty() == false)
+    if ((env_path = env_util::get("BSPWM_SOCKET")).empty() == false)
       return env_path;
 
     struct sockaddr_un sa;
diff --git a/src/utils/command.cpp b/src/utils/command.cpp
index 5fe04382..ece9206d 100644
--- a/src/utils/command.cpp
+++ b/src/utils/command.cpp
@@ -1,4 +1,5 @@
 #include <sys/wait.h>
+#include <unistd.h>
 #include <csignal>
 
 #include "utils/command.hpp"
@@ -8,8 +9,7 @@
 POLYBAR_NS
 
 namespace command_util {
-  command::command(const logger& logger, string cmd)
-      : m_log(logger), m_cmd("/usr/bin/env\nsh\n-c\n" + cmd) {
+  command::command(const logger& logger, string cmd) : m_log(logger), m_cmd("/usr/bin/env\nsh\n-c\n" + cmd) {
     if (pipe(m_stdin) != 0)
       throw command_strerror("Failed to allocate input stream");
     if (pipe(m_stdout) != 0)
@@ -142,7 +142,7 @@ namespace command_util {
    * Write line to command input channel
    */
   int command::writeline(string data) {
-    std::lock_guard<threading_util::spin_lock> lck(m_pipelock);
+    std::lock_guard<concurrency_util::spin_lock> lck(m_pipelock);
     return io_util::writeline(m_stdin[PIPE_WRITE], data);
   }
 
@@ -150,7 +150,7 @@ namespace command_util {
    * Read a line from the commands output stream
    */
   string command::readline() {
-    std::lock_guard<threading_util::spin_lock> lck(m_pipelock);
+    std::lock_guard<concurrency_util::spin_lock> lck(m_pipelock);
     return io_util::readline(m_stdout[PIPE_READ]);
   }
 
diff --git a/src/utils/env.cpp b/src/utils/env.cpp
new file mode 100644
index 00000000..77697416
--- /dev/null
+++ b/src/utils/env.cpp
@@ -0,0 +1,18 @@
+#include <thread>
+
+#include "utils/env.hpp"
+
+POLYBAR_NS
+
+namespace env_util {
+  bool has(const char* var) {
+    return std::getenv(var) != nullptr;
+  };
+
+  string get(const char* var, string fallback) {
+    const char* value{std::getenv(var)};
+    return value != nullptr ? value : fallback;
+  };
+}
+
+POLYBAR_NS_END
diff --git a/src/utils/inotify.cpp b/src/utils/inotify.cpp
index 5b4af297..cc967b54 100644
--- a/src/utils/inotify.cpp
+++ b/src/utils/inotify.cpp
@@ -1,3 +1,5 @@
+#include <unistd.h>
+
 #include "utils/inotify.hpp"
 #include "utils/memory.hpp"
 
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index 4890628d..273b248d 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -1,4 +1,5 @@
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include "utils/process.hpp"
 #include "utils/string.hpp"
diff --git a/src/utils/socket.cpp b/src/utils/socket.cpp
index 5dd67648..238a2ad1 100644
--- a/src/utils/socket.cpp
+++ b/src/utils/socket.cpp
@@ -1,7 +1,7 @@
-
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #include "utils/file.hpp"
 #include "utils/mixins.hpp"
@@ -67,8 +67,7 @@ namespace socket_util {
   /**
    * Receive data
    */
-  string unix_connection::receive(
-      const ssize_t receive_bytes, ssize_t& bytes_received_addr, int flags) {
+  string unix_connection::receive(const ssize_t receive_bytes, ssize_t& bytes_received_addr, int flags) {
     char buffer[BUFSIZ];
 
     bytes_received_addr = ::recv(m_fd, buffer, receive_bytes, flags);
diff --git a/src/utils/throttle.cpp b/src/utils/throttle.cpp
index 10f51c66..f60227c2 100644
--- a/src/utils/throttle.cpp
+++ b/src/utils/throttle.cpp
@@ -1,3 +1,5 @@
+#include <thread>
+
 #include "utils/throttle.hpp"
 
 POLYBAR_NS
@@ -23,7 +25,7 @@ namespace throttle_util {
       auto now = timepoint_clock::now();
       q.emplace_back(now);
       if (q.size() >= l) {
-        this_thread::sleep_for(now - q.front());
+        std::this_thread::sleep_for(now - q.front());
       }
       return true;
     }
diff --git a/src/x11/connection.cpp b/src/x11/connection.cpp
index 46c2875c..6a4766ee 100644
--- a/src/x11/connection.cpp
+++ b/src/x11/connection.cpp
@@ -1,9 +1,17 @@
 #include "config.hpp"
 
+#include "utils/factory.hpp"
 #include "x11/connection.hpp"
 
 POLYBAR_NS
 
+/**
+ * Configure injection module
+ */
+di::injector<connection&> configure_connection() {
+  return di::make_injector(di::bind<>().to(factory_util::generic_singleton<connection>(xutils::get_connection())));
+}
+
 /**
  * Preload required xcb atoms
  */
@@ -36,8 +44,7 @@ void connection::query_extensions() {
  * Create X window id string
  */
 string connection::id(xcb_window_t w) const {
-  return string_util::from_stream(
-      std::stringstream() << "0x" << std::hex << std::setw(7) << std::setfill('0') << w);
+  return string_util::from_stream(std::stringstream() << "0x" << std::hex << std::setw(7) << std::setfill('0') << w);
 }
 
 /**
@@ -52,8 +59,7 @@ xcb_screen_t* connection::screen() {
 /**
  * Creates an instance of shared_ptr<xcb_client_message_event_t>
  */
-shared_ptr<xcb_client_message_event_t> connection::make_client_message(
-    xcb_atom_t type, xcb_window_t target) const {
+shared_ptr<xcb_client_message_event_t> connection::make_client_message(xcb_atom_t type, xcb_window_t target) const {
   auto client_message = memory_util::make_malloc_ptr<xcb_client_message_event_t>(size_t{32});
 
   client_message->response_type = XCB_CLIENT_MESSAGE;
@@ -74,8 +80,8 @@ shared_ptr<xcb_client_message_event_t> connection::make_client_message(
 /**
  * Send client message event
  */
-void connection::send_client_message(shared_ptr<xcb_client_message_event_t> message,
-    xcb_window_t target, uint32_t event_mask, bool propagate) const {
+void connection::send_client_message(
+    shared_ptr<xcb_client_message_event_t> message, xcb_window_t target, uint32_t event_mask, bool propagate) const {
   const char* data = reinterpret_cast<decltype(data)>(message.get());
   send_event(propagate, target, event_mask, data);
   flush();
@@ -99,14 +105,12 @@ void connection::send_dummy_event(xcb_window_t target, uint32_t event) const {
  * Try to get a visual type for the given screen that
  * matches the given depth
  */
-optional<xcb_visualtype_t*> connection::visual_type(xcb_screen_t* screen, int match_depth) {
+boost::optional<xcb_visualtype_t*> connection::visual_type(xcb_screen_t* screen, int match_depth) {
   xcb_depth_iterator_t depth_iter = xcb_screen_allowed_depths_iterator(screen);
   if (depth_iter.data) {
     for (; depth_iter.rem; xcb_depth_next(&depth_iter))
       if (match_depth == 0 || match_depth == depth_iter.data->depth)
-        for (auto it = xcb_depth_visuals_iterator(depth_iter.data); it.rem;
-             xcb_visualtype_next(&it))
-          return it.data;
+        for (auto it = xcb_depth_visuals_iterator(depth_iter.data); it.rem; xcb_visualtype_next(&it)) return it.data;
     if (match_depth > 0)
       return visual_type(screen, 0);
   }
diff --git a/src/x11/fontmanager.cpp b/src/x11/fonts.cpp
similarity index 71%
rename from src/x11/fontmanager.cpp
rename to src/x11/fonts.cpp
index b6239f41..7798c1b6 100644
--- a/src/x11/fontmanager.cpp
+++ b/src/x11/fonts.cpp
@@ -1,26 +1,43 @@
-#include "x11/fontmanager.hpp"
-#include "utils/memory.hpp"
+#include <X11/Xlib-xcb.h>
+
 #include "utils/color.hpp"
+#include "utils/memory.hpp"
+#include "x11/connection.hpp"
+#include "x11/fonts.hpp"
+#include "x11/xlib.hpp"
 
 POLYBAR_NS
 
+/**
+ * Configure injection module
+ */
+di::injector<unique_ptr<font_manager>> configure_font_manager() {
+  return di::make_injector(configure_connection(), configure_logger());
+}
+
 array<char, XFT_MAXCHARS> xft_widths;
 array<wchar_t, XFT_MAXCHARS> xft_chars;
 
-fontmanager::fontmanager(connection& conn, const logger& logger)
-    : m_connection(conn), m_logger(logger) {
+void fonttype_deleter::operator()(fonttype* f) {
+  if (f->xft != nullptr)
+    XftFontClose(xlib::get_display(), f->xft);
+  else
+    xcb_close_font(xutils::get_connection(), f->ptr);
+}
+
+font_manager::font_manager(connection& conn, const logger& logger) : m_connection(conn), m_logger(logger) {
   m_display = xlib::get_display();
   m_visual = xlib::get_visual(conn.default_screen());
   m_colormap = xlib::create_colormap(conn.default_screen());
 }
 
-fontmanager::~fontmanager() {
+font_manager::~font_manager() {
   XftColorFree(m_display, m_visual, m_colormap, &m_xftcolor);
   XFreeColormap(m_display, m_colormap);
   m_fonts.clear();
 }
 
-void fontmanager::set_preferred_font(int index) {
+void font_manager::set_preferred_font(int index) {
   if (index <= 0) {
     m_fontindex = -1;
     return;
@@ -34,15 +51,15 @@ void fontmanager::set_preferred_font(int index) {
   }
 }
 
-bool fontmanager::load(string name, int fontindex, int offset_y) {
+bool font_manager::load(string name, int fontindex, int offset_y) {
   if (fontindex != -1 && m_fonts.find(fontindex) != m_fonts.end()) {
     m_logger.warn("A font with index '%i' has already been loaded, skip...", fontindex);
     return false;
   } else if (fontindex == -1) {
     fontindex = m_fonts.size();
-    m_logger.trace("fontmanager: Assign font '%s' to index '%d'", name.c_str(), fontindex);
+    m_logger.trace("font_manager: Assign font '%s' to index '%d'", name.c_str(), fontindex);
   } else {
-    m_logger.trace("fontmanager: Add font '%s' to index '%i'", name, fontindex);
+    m_logger.trace("font_manager: Add font '%s' to index '%i'", name, fontindex);
   }
 
   m_fonts.emplace(make_pair(fontindex, font_t{new fonttype(), fonttype_deleter{}}));
@@ -51,13 +68,13 @@ bool fontmanager::load(string name, int fontindex, int offset_y) {
   m_fonts[fontindex]->xft = nullptr;
 
   if (open_xcb_font(m_fonts[fontindex], name)) {
-    m_logger.trace("fontmanager: Successfully loaded X font '%s'", name);
+    m_logger.trace("font_manager: Successfully loaded X font '%s'", name);
   } else if ((m_fonts[fontindex]->xft = XftFontOpenName(m_display, 0, name.c_str())) != nullptr) {
     m_fonts[fontindex]->ptr = 0;
     m_fonts[fontindex]->ascent = m_fonts[fontindex]->xft->ascent;
     m_fonts[fontindex]->descent = m_fonts[fontindex]->xft->descent;
     m_fonts[fontindex]->height = m_fonts[fontindex]->ascent + m_fonts[fontindex]->descent;
-    m_logger.trace("fontmanager: Successfully loaded Freetype font '%s'", name);
+    m_logger.trace("font_manager: Successfully loaded Freetype font '%s'", name);
   } else {
     return false;
   }
@@ -75,7 +92,7 @@ bool fontmanager::load(string name, int fontindex, int offset_y) {
   return true;
 }
 
-font_t& fontmanager::match_char(uint16_t chr) {
+font_t& font_manager::match_char(uint16_t chr) {
   static font_t notfound;
   if (!m_fonts.empty()) {
     if (m_fontindex != -1 && size_t(m_fontindex) <= m_fonts.size()) {
@@ -91,7 +108,7 @@ font_t& fontmanager::match_char(uint16_t chr) {
   return notfound;
 }
 
-int fontmanager::char_width(font_t& font, uint16_t chr) {
+int font_manager::char_width(font_t& font, uint16_t chr) {
   if (!font)
     return 0;
 
@@ -121,11 +138,11 @@ int fontmanager::char_width(font_t& font, uint16_t chr) {
   return 0;
 }
 
-XftColor fontmanager::xftcolor() {
+XftColor font_manager::xftcolor() {
   return m_xftcolor;
 }
 
-void fontmanager::allocate_color(XRenderColor color, bool initial_alloc) {
+void font_manager::allocate_color(XRenderColor color, bool initial_alloc) {
   if (!initial_alloc)
     XftColorFree(m_display, m_visual, m_colormap, &m_xftcolor);
 
@@ -133,12 +150,12 @@ void fontmanager::allocate_color(XRenderColor color, bool initial_alloc) {
     m_logger.err("Failed to allocate color");
 }
 
-void fontmanager::set_gcontext_font(gcontext& gc, xcb_font_t font) {
+void font_manager::set_gcontext_font(gcontext& gc, xcb_font_t font) {
   const uint32_t values[1]{font};
   m_connection.change_gc(gc, XCB_GC_FONT, values);
 }
 
-bool fontmanager::open_xcb_font(font_t& fontptr, string fontname) {
+bool font_manager::open_xcb_font(font_t& fontptr, string fontname) {
   try {
     font xfont(m_connection, m_connection.generate_id());
 
@@ -147,8 +164,7 @@ bool fontmanager::open_xcb_font(font_t& fontptr, string fontname) {
 
     auto query = m_connection.query_font(xfont);
     if (query->char_infos_len == 0) {
-      m_logger.warn(
-          "X font '%s' does not contain any characters... (Verify the XLFD string)", fontname);
+      m_logger.warn("X font '%s' does not contain any characters... (Verify the XLFD string)", fontname);
       return false;
     }
 
@@ -166,21 +182,21 @@ bool fontmanager::open_xcb_font(font_t& fontptr, string fontname) {
 
     return true;
   } catch (const xpp::x::error::name& e) {
-    m_logger.trace("fontmanager: Could not find X font '%s'", fontname);
+    m_logger.trace("font_manager: Could not find X font '%s'", fontname);
   } catch (const shared_ptr<xcb_generic_error_t>& e) {
-    m_logger.trace("fontmanager: Could not find X font '%s'", fontname);
+    m_logger.trace("font_manager: Could not find X font '%s'", fontname);
   } catch (const std::exception& e) {
-    m_logger.trace("fontmanager: Could not find X font '%s' (what: %s)", fontname, e.what());
+    m_logger.trace("font_manager: Could not find X font '%s' (what: %s)", fontname, e.what());
   }
 
   return false;
 }
 
-bool fontmanager::has_glyph(font_t& font, uint16_t chr) {
+bool font_manager::has_glyph(font_t& font, uint16_t chr) {
   if (font->xft != nullptr) {
     return XftCharExists(m_display, font->xft, (FcChar32)chr) == true;
   } else {
-     if (chr < font->char_min || chr > font->char_max)
+    if (chr < font->char_min || chr > font->char_max)
       return false;
     if (static_cast<size_t>(chr - font->char_min) >= font->width_lut.size())
       return false;
diff --git a/src/x11/randr.cpp b/src/x11/randr.cpp
index 75d31785..e003091f 100644
--- a/src/x11/randr.cpp
+++ b/src/x11/randr.cpp
@@ -1,8 +1,22 @@
 #include "x11/randr.hpp"
+#include "x11/connection.hpp"
+#include "utils/string.hpp"
 
 POLYBAR_NS
 
+/**
+ * Workaround for the inconsistent naming
+ * of outputs between my intel and nvidia
+ * drivers (xf86-video-intel drops the dash)
+ */
+bool randr_output::match(const string& o, bool strict) const {
+  if (strict && name != o)
+    return false;
+  return name == o || name == string_util::replace(o, "-", "");
+}
+
 namespace randr_util {
+
   /**
    * Define monitor
    */
diff --git a/src/x11/tray.cpp b/src/x11/tray.cpp
index 01930658..df0babf0 100644
--- a/src/x11/tray.cpp
+++ b/src/x11/tray.cpp
@@ -1,12 +1,19 @@
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_image.h>
+#include <chrono>
+#include <thread>
 
 #include "components/signals.hpp"
+#include "components/types.hpp"
 #include "utils/color.hpp"
+#include "utils/factory.hpp"
 #include "utils/memory.hpp"
 #include "utils/process.hpp"
+#include "x11/color.hpp"
 #include "x11/connection.hpp"
 #include "x11/draw.hpp"
+#include "x11/events.hpp"
+#include "x11/graphics.hpp"
 #include "x11/tray.hpp"
 #include "x11/window.hpp"
 #include "x11/wm.hpp"
@@ -182,7 +189,7 @@ void tray_manager::activate() {  // {{{
   // replaced, we delay the notification broadcast to allow the clients
   // to get unembedded...
   if (m_othermanager)
-    this_thread::sleep_for(1s);
+    std::this_thread::sleep_for(std::chrono::seconds{1});
 
   notify_clients();
 
@@ -842,7 +849,7 @@ int16_t tray_manager::calculate_client_y() {  // {{{
 shared_ptr<tray_client> tray_manager::find_client(const xcb_window_t& win) const {  // {{{
   for (auto&& client : m_clients)
     if (client->match(win)) {
-      return shared_ptr<tray_client>{client.get(), null_deleter{}};
+      return shared_ptr<tray_client>{client.get(), factory_util::null_deleter{}};
     }
   return {};
 }  // }}}
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index e89037a2..f9bdaef3 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -5,6 +5,7 @@
 #include "x11/window.hpp"
 #include "x11/xutils.hpp"
 
+#include "x11/color.hpp"
 #include "components/types.hpp"
 
 POLYBAR_NS
diff --git a/src/x11/wm.cpp b/src/x11/wm.cpp
index f27c08ca..07e3db7d 100644
--- a/src/x11/wm.cpp
+++ b/src/x11/wm.cpp
@@ -2,6 +2,7 @@
 
 #include "x11/atoms.hpp"
 #include "x11/wm.hpp"
+#include "x11/connection.hpp"
 
 POLYBAR_NS
 
diff --git a/src/x11/xresources.cpp b/src/x11/xresources.cpp
index be51691d..97f5ad43 100644
--- a/src/x11/xresources.cpp
+++ b/src/x11/xresources.cpp
@@ -1,10 +1,22 @@
 #include <X11/Xlib.h>
 
+#include "utils/factory.hpp"
 #include "x11/xlib.hpp"
 #include "x11/xresources.hpp"
 
 POLYBAR_NS
 
+/**
+ * Configure injection module
+ */
+di::injector<const xresource_manager&> configure_xresource_manager() {
+  auto instance = factory_util::generic_singleton<xresource_manager>();
+  return di::make_injector(di::bind<>().to(instance));
+}
+
+/**
+ * Construct manager instance
+ */
 xresource_manager::xresource_manager() {
   XrmInitialize();
 
@@ -16,6 +28,9 @@ xresource_manager::xresource_manager() {
     return;
 }
 
+/**
+ * Get string value from the X resource db
+ */
 string xresource_manager::get_string(string name, string fallback) const {
   auto result = load_value(name, "String", 64);
   if (result.empty())
@@ -23,6 +38,9 @@ string xresource_manager::get_string(string name, string fallback) const {
   return result;
 }
 
+/**
+ * Get float value from the X resource db
+ */
 float xresource_manager::get_float(string name, float fallback) const {
   auto result = load_value(name, "String", 64);
   if (result.empty())
@@ -30,6 +48,9 @@ float xresource_manager::get_float(string name, float fallback) const {
   return strtof(result.c_str(), 0);
 }
 
+/**
+ * Get integer value from the X resource db
+ */
 int xresource_manager::get_int(string name, int fallback) const {
   auto result = load_value(name, "String", 64);
   if (result.empty())
@@ -37,6 +58,9 @@ int xresource_manager::get_int(string name, int fallback) const {
   return atoi(result.c_str());
 }
 
+/**
+ * Query the database for given key
+ */
 string xresource_manager::load_value(string key, string res_type, size_t n) const {
   if (m_manager == nullptr)
     return "";
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cac2a006..b7decb01 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,13 +3,16 @@
 #
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -include common/test.hpp")
 
-include_directories(${CMAKE_CURRENT_LIST_DIR})
-include_directories(${APP_INCLUDE_DIRS})
+include_directories(
+  ${APP_INCLUDE_DIRS}
+  ${PROJECT_SOURCE_DIR}/src
+  ${CMAKE_CURRENT_LIST_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR})
+link_libraries(${APP_LIBRARIES})
 
 function(unit_test file)
   string(REPLACE "/" "_" testname ${file})
-  add_executable(unit_test.${testname} ${CMAKE_CURRENT_LIST_DIR}/unit_tests/${file}.cpp)
-  target_link_libraries(unit_test.${testname} ${APP_LIBRARIES})
+  add_executable(unit_test.${testname} ${CMAKE_CURRENT_LIST_DIR}/unit_tests/${file}.cpp ${SOURCE_DEPS})
   add_test(unit_test.${testname} unit_test.${testname})
 endfunction()
 
@@ -19,7 +22,6 @@ unit_test("utils/memory")
 unit_test("utils/string")
 unit_test("components/command_line")
 unit_test("components/di")
-#unit_test("components/logger")
-#unit_test("x11/color")
-#unit_test("x11/connection")
-#unit_test("x11/window")
+unit_test("x11/color")
+unit_test("x11/connection")
+unit_test("x11/winspec")
diff --git a/tests/unit_tests/components/command_line.cpp b/tests/unit_tests/components/command_line.cpp
index 9d031a0d..abf42fad 100644
--- a/tests/unit_tests/components/command_line.cpp
+++ b/tests/unit_tests/components/command_line.cpp
@@ -1,5 +1,5 @@
-#include "components/command_line.hpp"
-#include "utils/string.hpp"
+#include "components/command_line.cpp"
+#include "utils/string.cpp"
 
 int main() {
   using namespace polybar;
diff --git a/tests/unit_tests/components/di.cpp b/tests/unit_tests/components/di.cpp
index 8f85389f..8b843ee2 100644
--- a/tests/unit_tests/components/di.cpp
+++ b/tests/unit_tests/components/di.cpp
@@ -1,9 +1,9 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-#include "components/logger.hpp"
-#include "utils/inotify.hpp"
-#include "utils/string.hpp"
+#include "components/logger.cpp"
+#include "utils/inotify.cpp"
+#include "utils/string.cpp"
 
 #define CONFIGURE_ARGS(T, V, Args) configure_##T<decltype(V)>(Args).create<decltype(V)>()
 #define CONFIGURE(T, V) configure_##T<decltype(V)>().create<decltype(V)>()
diff --git a/tests/unit_tests/components/logger.cpp b/tests/unit_tests/components/logger.cpp
deleted file mode 100644
index daebe3a7..00000000
--- a/tests/unit_tests/components/logger.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "components/logger.hpp"
-
-int main() {
-  using namespace polybar;
-
-  "output"_test = [] {
-    auto l = logger::configure<logger>(loglevel::TRACE).create<logger>();
-    l.err("error");
-    l.warn("warning");
-    l.info("info");
-    l.trace("trace");
-  };
-}
diff --git a/tests/unit_tests/utils/string.cpp b/tests/unit_tests/utils/string.cpp
index 0ea92662..ad0ef448 100644
--- a/tests/unit_tests/utils/string.cpp
+++ b/tests/unit_tests/utils/string.cpp
@@ -1,6 +1,6 @@
 #include <iomanip>
 
-#include "utils/string.hpp"
+#include "utils/string.cpp"
 
 int main() {
   using namespace polybar;
diff --git a/tests/unit_tests/x11/color.cpp b/tests/unit_tests/x11/color.cpp
index d295a379..603b0452 100644
--- a/tests/unit_tests/x11/color.cpp
+++ b/tests/unit_tests/x11/color.cpp
@@ -1,28 +1,29 @@
 #include <csignal>
 
-#include "x11/color.hpp"
+#include "utils/color.hpp"
+#include "x11/color.cpp"
 
 int main() {
   using namespace polybar;
 
   "color"_test = [] {
     color test{"#33990022"};
-    expect(test.hex_to_rgba() == "#33990022");
-    expect(test.hex_to_rgb() == "#1E0006");
+    expect(color_util::hex<uint8_t>(test) == "#1E0006");
+    expect(color_util::hex<uint16_t>(test) == "#33990022");
   };
 
   "channels"_test = [] {
     color test{"#eefb9281"};
-    expect(test.alpha() == 0xee);
-    expect(test.red() == 0xfb);
-    expect(test.green() == 0x92);
-    expect(test.blue() == 0x81);
+    expect(color_util::alpha_channel<uint8_t>(test) == 0xee);
+    expect(color_util::red_channel<uint8_t>(test) == 0xfb);
+    expect(color_util::green_channel<uint8_t>(test) == 0x92);
+    expect(color_util::blue_channel<uint8_t>(test) == 0x81);
   };
 
   "base"_test = [] {
     color test{"#eefb9281"};
-    auto hex = test.hex_to_rgb();
-    expect(std::strtoul(&hex[0], 0, 16) == 0x000000);
+    auto hex = color_util::hex<uint8_t>(test);
+    expect(std::strtoul(&hex[0], 0, 16) == 0x0);
   };
 
   "cache"_test = [] {
@@ -33,17 +34,17 @@ int main() {
     expect(g_colorstore.size() == size_t{2});
     auto c3 = color::parse("#200");
     expect(g_colorstore.size() == size_t{2});
-    expect(g_colorstore.find("#100")->second.value() == c1.value());
+    expect((uint32_t)g_colorstore.find("#100")->second == (uint32_t)c1);
   };
 
   "predefined"_test = [] {
-    expect(g_colorblack.hex_to_rgba() == "#FF000000");
-    expect(g_colorwhite.hex_to_rgba() == "#FFFFFFFF");
+    expect(color_util::hex<uint16_t>(g_colorblack) == "#FF000000");
+    expect(color_util::hex<uint16_t>(g_colorwhite) == "#FFFFFFFF");
   };
 
   "parse"_test = [] {
-    expect(color::parse("#ff9900", g_colorblack).hex_to_rgba() == "#FFFF9900");
-    expect(color::parse("invalid", g_colorwhite).hex_to_rgba() == "#FFFFFFFF");
-    expect(color::parse("33990022", g_colorwhite).hex_to_rgb() == "#1E0006");
+    expect(color_util::hex<uint16_t>(color::parse("#ff9900", g_colorblack)) == "#FFFF9900");
+    expect(color_util::hex<uint16_t>(color::parse("invalid", g_colorwhite)) == "#FFFFFFFF");
+    expect(color_util::hex<uint8_t>(color::parse("33990022", g_colorwhite)) == "#1E0006");
   };
 }
diff --git a/tests/unit_tests/x11/connection.cpp b/tests/unit_tests/x11/connection.cpp
index e0a13b89..4bce78a6 100644
--- a/tests/unit_tests/x11/connection.cpp
+++ b/tests/unit_tests/x11/connection.cpp
@@ -1,10 +1,14 @@
-#include "x11/connection.hpp"
+#include "utils/string.cpp"
+#include "x11/atoms.cpp"
+#include "x11/connection.cpp"
+#include "x11/xutils.cpp"
+#include "x11/xlib.cpp"
 
 int main() {
   using namespace polybar;
 
   "id"_test = [] {
-    connection& conn{connection::configure().create<connection&>()};
+    connection& conn{configure_connection().create<connection&>()};
     expect(conn.id(static_cast<xcb_window_t>(0x12345678)) == "0x12345678");
   };
 }
diff --git a/tests/unit_tests/x11/window.cpp b/tests/unit_tests/x11/window.cpp
deleted file mode 100644
index 7ecb1458..00000000
--- a/tests/unit_tests/x11/window.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "x11/window.hpp"
-
-int main() {
-  using namespace polybar;
-
-  "cw_create"_test = [] {
-    // clang-format off
-    auto win = winspec()
-      << cw_size(100, 200)
-      << cw_pos(10, -20)
-      << cw_border(9)
-      << cw_class(XCB_WINDOW_CLASS_INPUT_ONLY)
-      << cw_parent(0x000110a)
-      ;
-    // clang-format on
-
-    expect(win.width == 100);
-    expect(win.height == 200);
-    expect(win.x == 10);
-    expect(win.y == -20);
-    expect(win.border_width == 9);
-    expect(win.class_ == XCB_WINDOW_CLASS_INPUT_ONLY);
-    expect(win.parent == 0x000110a);
-  };
-}
diff --git a/tests/unit_tests/x11/winspec.cpp b/tests/unit_tests/x11/winspec.cpp
new file mode 100644
index 00000000..d853e828
--- /dev/null
+++ b/tests/unit_tests/x11/winspec.cpp
@@ -0,0 +1,33 @@
+#include "utils/string.cpp"
+#include "x11/atoms.cpp"
+#include "x11/connection.cpp"
+#include "x11/winspec.hpp"
+#include "x11/xutils.cpp"
+#include "x11/xlib.cpp"
+
+int main() {
+  using namespace polybar;
+
+  "cw_create"_test = [] {
+    connection& conn{configure_connection().create<connection&>()};
+    auto id = conn.generate_id();
+
+    // clang-format off
+    auto win = winspec(conn, id)
+      << cw_size(100, 200)
+      << cw_pos(10, -20)
+      << cw_border(9)
+      << cw_class(XCB_WINDOW_CLASS_INPUT_ONLY)
+      << cw_parent(0x000110a)
+      ;
+    // clang-format on
+
+    expect(static_cast<xcb_window_t>(win) == id);
+
+    xcb_rectangle_t rect{static_cast<xcb_rectangle_t>(win)};
+    expect(rect.width == 100);
+    expect(rect.height == 200);
+    expect(rect.x == 10);
+    expect(rect.y == -20);
+  };
+}