diff --git a/dotconfig/waybar/config b/dotconfig/waybar/config
index 76fb126..91e8a91 100644
--- a/dotconfig/waybar/config
+++ b/dotconfig/waybar/config
@@ -5,15 +5,15 @@
     // "width": 1280, // Waybar width
     // "spacing": 4, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-left": ["hyprland/workspaces" ],
+    "modules-left": ["clock", "network", "hyprland/workspaces" ],
     "modules-center": ["hyprland/window"],
-    "modules-right": [ "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "clock", "tray"], // mpd, keyboard-state, idle_inhibitor
+    "modules-right": [ "pulseaudio", "backlight", "battery", "tray"], // mpd, cpu, memory, keyboard-state, temperature, idle_inhibitor
     // Modules configuration
     "hyprland/workspaces": {
     		"disable-scroll": true,
 				// "on-scroll-up": "hyprctl dispatch workspace e+1",
 				// "on-scroll-down": "hyprctl dispatch workspace e-1",
-				"on-click": "activate",
+			"on-click": "activate",
     		"all-outputs": true,
     		"format": "{name}",
     		// "format-icons": {
@@ -85,9 +85,23 @@
         "spacing": 10
     },
     "clock": {
-        // "timezone": "America/New_York",
+        "interval": 1,
+        "format": " {:%H:%M:%S}",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
+        "calendar": {
+            "mode": "month",
+            "weeks-pos": "right",
+            "on-scroll": 1,
+            "on-click-right": "mode",
+            "format": {
+                "months":     "<span color='#ffead3'><b>{}</b></span>",
+                "days":       "<span color='#ecc6d9'><b>{}</b></span>",
+                "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
+                "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
+                "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
+            }
+        },
+        "format-alt": "  {:%Y-%m-%d}"
     },
     "cpu": {
         "format": "{usage}% ",
diff --git a/dotconfig/waybar/style.css b/dotconfig/waybar/style.css
index e17a1fa..261c684 100644
--- a/dotconfig/waybar/style.css
+++ b/dotconfig/waybar/style.css
@@ -38,7 +38,7 @@ window#waybar.hidden {
 
 #workspaces {
 	margin-top: 8px;
-	margin-left: 12px;
+	margin-left: 8px;
 	margin-bottom: 0;
 	border-radius: 26px;
 	background: #282a36;
@@ -75,14 +75,17 @@ window#waybar.hidden {
 
 #network {
 	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
+	/*margin-left: 8px;*/
+	/*padding-left: 16px;*/
 	padding-right: 16px;
 	margin-bottom: 0;
-	border-radius: 26px;
+	border-radius: 0px 26px 26px 0px;
 	transition: none;
-	color: #4d4d4d;
-	background: #bd93f9;
+	/*color: #f8f8f2;*/
+	background: #282a36;
+	color: #bd93f9;
+	/*color: #4d4d4d;*/
+	/*background: #bd93f9;*/
 }
 
 #pulseaudio {
@@ -91,10 +94,12 @@ window#waybar.hidden {
 	padding-left: 16px;
 	padding-right: 16px;
 	margin-bottom: 0;
-	border-radius: 26px;
+	border-radius: 26px 0px 0px 26px;
 	transition: none;
-	color: #4d4d4d;
-	background: #9aedfe;
+	/*color: #4d4d4d;*/
+	/*background: #9aedfe;*/
+    color: #99ddff;
+	background: #282a36;
 }
 
 #temperature {
@@ -135,38 +140,44 @@ window#waybar.hidden {
 
 #backlight {
 	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
+	/*margin-left: 8px;*/
+	/*padding-left: 16px;*/
 	padding-right: 16px;
 	margin-bottom: 0;
-	border-radius: 26px;
+	border-radius: 0px 0px 0px 0px;
 	transition: none;
-	color: #4d4d4d;
-	background: #ff751a;
+	/*color: #4d4d4d;
+	background: #ff751a;*/
+    color: #ff8844;
+	background: #282a36;
 }
 
 #battery {
 	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
+	/*margin-left: 8px;*/
+    margin-right: 12px;
+	/*padding-left: 16px;*/
 	padding-right: 16px;
 	margin-bottom: 0;
-	border-radius: 26px;
+	border-radius: 0px 26px 26px 0px;
 	transition: none;
-	color: #4d4d4d;
-	background: #ffc61a;
+	/*color: #4d4d4d;
+	background: #ffc61a;*/
+    color: #ffdd44;
+	background: #282a36;
 }
 
 #clock {
 	margin-top: 8px;
-	margin-left: 8px;
-	margin-right: 12px;
+	margin-left: 12px;
+	/*margin-right: 12px;*/
     padding-top: 2px;
 	padding-left: 16px;
 	padding-right: 16px;
 	margin-bottom: 0;
-	border-radius: 26px;
+	border-radius: 26px 0px 0px 26px;
 	transition: none;
-	color: #f8f8f2;
+	/*color: #f8f8f2;*/
+    color: #ffcc44;
 	background: #282a36;
 }