diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index e57a81b..6378eb7 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -54,6 +54,7 @@ window#waybar {
 
 #clock {
   color: @foreground;
+  font-weight: bold;
 }
 
 #battery {
diff --git a/.config/waybar/sway-modules.json b/.config/waybar/sway-modules.json
index 5ccceb2..94bf97a 100644
--- a/.config/waybar/sway-modules.json
+++ b/.config/waybar/sway-modules.json
@@ -1,72 +1,97 @@
 {
-  "sway/workspaces": {
-    "show_special": true,
-    "on-click": "activate"
-  },
-  "sway/window": {
-    "max-length": 50
-  },
-  "tray": {
-    "spacing": 10
-  },
-  "cpu": {
-    "format": " {load}",
-    "format-alt": " {usage}% @ {avg_frequency}GHz"
-  },
-  "memory": {
-    "format": "󰍛 {used:0.1f}G / {total:0.1f}G",
-    "format-alt": "󰓡 Swap: {swapUsed:0.1f}G / {swapTotal:0.1f}G"
-  },
-  "network": {
-    "format-wifi": " {essid} ({signalStrength}%)",
-    "format-ethernet": "󰈀 {ifname}",
-    "format-linked": " {ifname}",
-    "format-disconnected": "󰌙 Disconnected",
-    "format-alt": "󰩟 {ifname}: {ipaddr}/{cidr}",
-    "tooltip-format": "{ifname} via {gwaddr}"
-  },
-  "battery": {
-    "states": {
-      "good": 75,
-      "warning": 15,
-      "critical": 5
-    },
-    "format": "{icon} {capacity}%",
-    "format-charging": "󰉁 {capacity}%",
-    "format-plugged": " {capacity}%",
-    "format-alt": "{icon} ETA: {time}",
-    "format-icons": ["", "", "", "", ""]
-  },
-  "clock": {
-    "format": "{:󰅐 %H:%M   %m-%d}",
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-  },
-  "custom/notification": {
-    "tooltip": true,
-    "format": "{icon}",
-    "format-icons": {
-      "notification": " <span foreground='red'><sup></sup></span> <span weight=\"bold\">Unread</span>",
-      "none": "  <span style=\"italic\">Empty</span>",
-      "dnd-notification": "  <span style=\"italic\">DND on</span>",
-      "dnd-none": "  <span style=\"italic\">DND on</span>"
-    },
-    "return-type": "json",
-    "exec-if": "which swaync-client",
-    "exec": "swaync-client -swb",
-    "on-click": "swaync-client -t -sw",
-    "on-click-right": "swaync-client -d -sw",
-    "escape": true
-  },
-  "custom/player": {
-    "format": "{icon} <span style=\"italic\">{}</span>",
-    "format-icons": {
-      "Playing": "󰎈 ",
-      "Paused": "󰏤 "
-    },
-    "return-type": "json",
-    "exec": "playerctl -a metadata --format '{\"text\": \"{{playerName}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{markup_escape(title)}} - {{markup_escape(album)}}\", \"class\": \"{{status}}\", \"alt\": \"{{status}}\" }' -F",
-    "max-length": 40,
-    "on-click": "playerctl play-pause",
-    "on-click-right": "pavucontrol"
-  }
+	"sway/workspaces": {
+		"show_special": true,
+		"on-click": "activate"
+	},
+	"sway/window": {
+		"max-length": 50
+	},
+	"tray": {
+		"spacing": 10
+	},
+	"cpu": {
+		"format": " {load}",
+		"format-alt": " {usage}% @ {avg_frequency}GHz"
+	},
+	"memory": {
+		"format": "󰍛 {used:0.1f} / {total:0.1f}G",
+		"format-alt": "󰓡 Swap: {swapUsed:0.1f}G / {swapTotal:0.1f}G"
+	},
+	"network": {
+		"format-wifi": " {essid} ({signalStrength}%)",
+		"format-ethernet": "󰈀 {ifname}",
+		"format-linked": " {ifname}",
+		"format-disconnected": "󰌙 Disconnected",
+		"format-alt": "󰩟 {ifname}: {ipaddr}/{cidr}",
+		"tooltip-format": "{ifname} via {gwaddr}"
+	},
+	"battery": {
+		"states": {
+			"good": 75,
+			"warning": 15,
+			"critical": 5
+		},
+		"format": "{icon} {capacity}%",
+		"format-charging": "󰉁 {capacity}%",
+		"format-plugged": " {capacity}%",
+		"format-alt": "{icon} ETA: {time}",
+		"format-icons": [
+			"",
+			"",
+			"",
+			"",
+			""
+		]
+	},
+	"clock": {
+		"format": "{:󰅐 %H:%M}",
+		"format-alt": "{: %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='#98971a'><b>{}</b></span>",
+				"days": "<span color='#ebdbb2'><b>{}</b></span>",
+				"weeks": "<span color='#458588'><b>W{}</b></span>",
+				"weekdays": "<span color='#d79921'><b>{}</b></span>",
+				"today": "<span color='#d65d0e'><b><u>{}</u></b></span>"
+			}
+		},
+		"actions": {
+			"on-click-right": "mode",
+			"on-scroll-down": "shift_up",
+			"on-scroll-up": "shift_down"
+		}
+	},
+	"custom/notification": {
+		"tooltip": true,
+		"format": "{icon}",
+		"format-icons": {
+			"notification": " <span foreground='red'><sup></sup></span> <span weight=\"bold\">Unread</span>",
+			"none": "  <span style=\"italic\">Empty</span>",
+			"dnd-notification": "  <span style=\"italic\">DND on</span>",
+			"dnd-none": "  <span style=\"italic\">DND on</span>"
+		},
+		"return-type": "json",
+		"exec-if": "which swaync-client",
+		"exec": "swaync-client -swb",
+		"on-click": "swaync-client -t -sw",
+		"on-click-right": "swaync-client -d -sw",
+		"escape": true
+	},
+	"custom/player": {
+		"format": "{icon} <span style=\"italic\">{}</span>",
+		"format-icons": {
+			"Playing": "󰎈 ",
+			"Paused": "󰏤 "
+		},
+		"return-type": "json",
+		"exec": "playerctl -a metadata --format '{\"text\": \"{{playerName}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{markup_escape(title)}} - {{markup_escape(album)}}\", \"class\": \"{{status}}\", \"alt\": \"{{status}}\" }' -F",
+		"max-length": 40,
+		"on-click": "playerctl play-pause",
+		"on-click-right": "pavucontrol"
+	}
 }