diff --git a/dot_config/waybar/config b/dot_config/waybar/config.tmpl
similarity index 59%
rename from dot_config/waybar/config
rename to dot_config/waybar/config.tmpl
index 7cd4a2aaecbe9d1522c03af0d1cdea24aa7cd34a..1e7f9abd7e25a6c60a8b02f6aef040753d345852 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config.tmpl
@@ -1,9 +1,8 @@
 {
     "layer": "top", // Waybar at top layer
-    "height": 30, // Waybar height (to be removed for auto height)
     "spacing": 5,
     "modules-left": ["hyprland/workspaces", "hyprland/window"],
-    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight",  "battery", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight",  "battery", {{ if eq .chezmoi.hostname "angmar" }}"clock#date", {{ end }}"clock#all", "custom/beats", "tray"],
     "hyprland/workspaces": {
         "disable-scroll": true,
         "all-outputs": true,
@@ -23,10 +22,47 @@
         // "icon-size": 21,
         "spacing": 10
     },
-    "clock": {
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+    "clock#date": {
+        "format": "{:%Y-%m-%d} 󰃭",
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+            "mode": "year",
+            "mode-mon-col": 3,
+            "on-scroll": 1,
+            "on-click-right": "mode",
+            "format": {
+                "months": "<span color='#ffead3'><b>{}</b></span>",
+                "days": "<span color='#ecc6d9'><b>{}</b></span>",
+                "weeks": "<span color='#99ffdd'><b>W{}</b></span>",
+                "weekdays": "<span color='#ffcc66'><b>{}</b></span>",
+                "today": "<span color='#ff6699'><b><u>{}</u></b></span>"
+            }
+        },
+    },
+    "clock#all": {
         "format": "{:%H:%M} ",
-        "format-alt": "{:%Y-%m-%d} 󰃭"
+        "format-alt": "{:%Y-%m-%d} 󰃭",
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+            "mode": "year",
+            "mode-mon-col": 3,
+            "on-scroll": 1,
+            "on-click-right": "mode",
+            "format": {
+                "months": "<span color='#ffead3'><b>{}</b></span>",
+                "days": "<span color='#ecc6d9'><b>{}</b></span>",
+                "weeks": "<span color='#99ffdd'><b>W{}</b></span>",
+                "weekdays": "<span color='#ffcc66'><b>{}</b></span>",
+                "today": "<span color='#ff6699'><b><u>{}</u></b></span>"
+            }
+        },
+    },
+    "custom/beats": {
+        "exec-if": "/usr/bin/swatchtime",
+        "exec": "echo \"@`swatchtime -f {Beat}`\"",
+        "return-type": "",
+        "interval": 0.5,
+        "format": "{} 󱇼"
     },
     "cpu": {
         "format": "{usage}% ",
diff --git a/dot_config/waybar/style.css.tmpl b/dot_config/waybar/style.css.tmpl
index 107c42959ac90609dabe756d63fb1928a92a7204..536084cf99428912c8ba1ed10f35c2ed1ec8cb90 100644
--- a/dot_config/waybar/style.css.tmpl
+++ b/dot_config/waybar/style.css.tmpl
@@ -57,6 +57,7 @@ button {
 #clock,
 #battery,
 #cpu,
+#custom-beats,
 #memory,
 #disk,
 #temperature,