diff --git a/images/image.png b/images/image.png
index 90031d3..40c3eb5 100644
Binary files a/images/image.png and b/images/image.png differ
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 03b654d..4196d6e 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -10,16 +10,27 @@
 		"custom/pacman",
 		"custom/recorder",
 		"privacy",
-		"memory",
-		"disk",
-		"pulseaudio",
-		"pulseaudio#microphone",
-		"backlight",
-		"battery",
-		"bluetooth",
-		"network"
+		"group/system",
+		"group/misc",
+		"group/connections",
+		"custom/power"
 	],
 
+	"group/system": {
+		"orientation": "inherit",
+		"modules": ["memory", "disk"]
+	},
+
+	"group/misc": {
+		"orientation": "inherit",
+		"modules": ["pulseaudio", "pulseaudio#microphone", "backlight", "battery"]
+	},
+
+	"group/connections": {
+		"orientation": "inherit",
+		"modules": ["bluetooth", "network"]
+	},
+
 	"sway/workspaces": {
 		"format": "{name}  {icon}",
 		"disable-scroll": true,
@@ -37,8 +48,8 @@
 	"clock": {
 		"tooltip": true,
 		"timezones": ["Europe/Rome"],
-		"format": "{:%H:%M}",
-		"format-alt": "{:%Y-%m-%d}",
+		"format": "{:%a %d %H:%M}",
+		"format-alt": "{%H:%M}",
 		"tooltip-format": "{calendar}",
 		"calendar": {
 			"mode": "year",
@@ -69,7 +80,7 @@
 	},
 
 	"custom/pacman": {
-		"tooltip": false,
+		"tooltip": true,
 		"format": "{} ",
 		"interval": 60,
 		"exec": "checkupdates | wc -l",
@@ -86,6 +97,12 @@
 		"exec-if": "pgrep wf-recorder"
 	},
 
+	"custom/power": {
+		"format": "⏻",
+		"on-click": "wlogout",
+		"tooltip": "Power options"
+	},
+
 	"privacy": {
 		"icon-spacing": 4,
 		"icon-size": 18,
@@ -167,18 +184,18 @@
 	"memory": {
 		"interval": 3,
 		"tooltip": true,
-		"format": "{used}GiB ",
-		"tooltip-format": "{used}GiB used out of {total}GiB ({percentage}%)",
-		"max-length": 10
+		"format": "{used:0.2f}GiB ",
+		"tooltip-format": "{used:0.2f}GiB used out of {total}GiB ({percentage}%)"
 	},
 
 	"bluetooth": {
 		"tooltip": true,
-		"format": "{status} 󰂯",
-		"format-disabled": "{status} 󰂲",
+		"format": "󰂯",
+		"format-disabled": "󰂲",
 		"format-connected": "{device_alias} 󰂯",
 		"format-connected-battery": "{device_alias} 󰂯 {device_battery_percentage}%",
 		"tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
+		"tooltip-format-disabled": "Disabled",
 		"on-click": "blueman-manager"
 	},
 
@@ -187,12 +204,12 @@
 		"tooltip": true,
 		"format": "{ifname}",
 		"format-disconnected": "󰖪",
-		"format-wifi": "{essid} 󰖩",
-		"format-ethernet": "{essid} 󰈀",
+		"format-wifi": "󰖩",
+		"format-ethernet": "󰈀",
 		"tooltip-format": "{ifname} via {gwaddr} 󰈀",
-		"tooltip-format-wifi": "{ipaddr} on {ifname} via {essid} ",
-		"tooltip-format-ethernet": "{ipaddr} on {ifname} via {essid} 󰈀",
-		"tooltip-format-disconnected": "󰖪",
+		"tooltip-format-wifi": "{ipaddr} ({ifname}) via {essid} ",
+		"tooltip-format-ethernet": "{ipaddr} ({ifname}) via {essid} 󰈀",
+		"tooltip-format-disconnected": "Disconnected",
 		"max-length": 50,
 		"on-click": "nm-connection-editor"
 	}
diff --git a/waybar/style.css b/waybar/style.css
index 7c2858e..7744db2 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -10,10 +10,6 @@
 	background-color: transparent;
 }
 
-#waybar.hidden {
-	opacity: 0.2;
-}
-
 tooltip {
 	background-color: #383c4a;
 	border-radius: 10px;
@@ -23,59 +19,60 @@ tooltip label {
 	color: white;
 }
 
+#connections {
+	border-radius: 10px;
+	background-color: #383c4a;
+	color: #ffffff;
+	margin-left: 8px;
+	padding-left: 8px;
+	padding-right: 8px;
+}
+
+#misc {
+	border-radius: 10px;
+	background-color: #383c4a;
+	color: #ffffff;
+	margin-left: 8px;
+	padding-left: 8px;
+	padding-right: 8px;
+}
+
+#system {
+	border-radius: 10px;
+	background-color: #383c4a;
+	color: #ffffff;
+	margin-left: 8px;
+	padding-left: 8px;
+	padding-right: 8px;
+}
+
+#custom-pacman,
+#custom-recorder,
+#mode,
+#clock,
+#workspaces,
+#custom-recorder,
+#custom-power,
+#privacy {
+	border-radius: 10px;
+	background-color: #383c4a;
+	color: #ffffff;
+}
+
+#custom-pacman,
+#custom-recorder,
+#mode,
+#custom-power,
+#privacy {
+	margin-left: 8px;
+}
+
 #custom-pacman,
 #custom-recorder,
 #mode,
 #clock,
-#battery,
-#disk,
 #privacy,
-#memory,
-#bluetooth,
-#network {
-	transition: none;
-	border-radius: 10px;
-	background-color: #383c4a;
-	color: #ffffff;
-	padding-top: 4px;
-	padding-bottom: 4px;
-	padding-left: 8px;
-	padding-right: 8px;
-	margin-right: 4px;
-	margin-left: 4px;
-}
-
-#backlight,
-#pulseaudio {
-	transition: none;
-	background-color: #383c4a;
-	color: #ffffff;
-	margin: 0px;
-}
-
-#pulseaudio:not(.microphone) {
-	margin-left: 4px;
-	border-radius: 10px 0 0 10px;
-	padding-right: 8px;
-	padding-left: 8px;
-}
-
-#backlight {
-	border-radius: 0 10px 10px 0;
-	padding-left: 8px;
-	padding-right: 8px;
-	margin-right: 4px;
-}
-
-#workspaces {
-	transition: none;
-	border-radius: 10px;
-	background-color: #383c4a;
-	color: #7c818c;
-	margin-right: 4px;
-	margin-left: 4px;
-}
-
+#custom-power,
 #workspaces button {
 	padding-top: 4px;
 	padding-bottom: 4px;
@@ -83,38 +80,23 @@ tooltip label {
 	padding-right: 8px;
 }
 
-#workspaces button:hover {
-	border-radius: inherit;
-	background-color: #666768;
-}
-
-#bluetooth.connected,
-#bluetooth.on {
-	background-color: #26a65b;
-}
-
-#bluetooth.disabled,
-#bluetooth.off {
-	background-color: #f53c3c;
-}
-
-#idle_inhibitor.activated {
-	background-color: #26a65b;
+#pulseaudio:not(.microphone),
+#pulseaudio.microphone,
+#memory,
+#backlight,
+#bluetooth {
+	padding-right: 8px;
 }
 
 #battery.charging {
-	color: #ffffff;
-	background-color: #26a65b;
+	color: #32e47c;
 }
 
 #battery.warning:not(.charging) {
-	background-color: #ffbe61;
-	color: black;
+	color: #ffbe61;
 }
 
 #battery.critical:not(.charging) {
-	background-color: #383c4a;
-	color: #ffffff;
 	animation-name: redblink;
 	animation-duration: 0.5s;
 	animation-timing-function: linear;
@@ -122,22 +104,17 @@ tooltip label {
 	animation-direction: alternate;
 }
 
-#network.wifi,
-#network.ethener {
-	background-color: #26a65b;
-}
-
-#network.disabled,
-#network.disconnected {
-	background-color: #f53c3c;
-}
-
 @keyframes redblink {
 	to {
-		background-color: #f53c3c;
+		color: #f53c3c;
 	}
 }
 
-#custom-recorder {
+#workspaces button:hover {
+	border-radius: inherit;
+	background-color: #666768;
+}
+
+#idle_inhibitor.activated {
 	background-color: #26a65b;
 }