diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index ccf97cf..30f9750 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -185,6 +185,9 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
 bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
+# Some workspace customization
+workspace = 1, monitor:HDMI-A-1, default:true
+
 # Move active window to position
 bind = $mainMod SHIFT, left, movewindow, l
 bind = $mainMod SHIFT, right, movewindow, r
diff --git a/.config/waybar/config b/.config/waybar/config
index 80bd7f5..b37478a 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -99,6 +99,7 @@
 			"critical": 20
 		},
 		"format": "{icon}  {capacity}%",
+    "format-charging": " {icon}  {capacity}%",
 		"format-icons": [
 			"",
 			"",
@@ -116,10 +117,10 @@
     "format": "{ifname}",
     "format-wifi": "{essid}  ",
     "format-ethernet": "{ipaddr}/{cidr} 󰊗 ",
-    "format-disconnected": "", //An empty format will hide the module.
+    "format-disconnected": "disconnected :(", //An empty format will hide the module.
     "tooltip-format": "{ifname} via {gwaddr} 󰊗 ",
     "tooltip-format-wifi": "Up: {bandwidthUpBytes} - Down: {bandwidthDownBytes}",
     "tooltip-format-ethernet": "{ifname}  ",
     "tooltip-format-disconnected": "Disconnected",
-  }
+  },
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 0b716ee..d61c2d7 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -13,7 +13,7 @@ window#waybar {
 }
 
 #clock.1, #clock.2, #clock.3,
-#pulseaudio, #memory, #cpu, #network,
+#pulseaudio, #memory, #cpu, #network, #mpd,
 #battery, #disk, #backlight, #tray,
 #keyboard-state {
   background: rgba(12, 12, 12, 0.5);
@@ -38,7 +38,7 @@ window#waybar.empty #window {
 }
 
 #workspaces button {
-	padding: 0 2px;
+	padding: 0 4px;
 	color: #fdf6e3;
   border: 2px solid transparent;
 }
@@ -46,7 +46,7 @@ window#waybar.empty #window {
 /* button.active for hyprland, button.focused for sway */
 #workspaces button.active {
 	color: white;
-  border: 2px solid rgba(40, 190, 120, 0.8);
+  border: 2px solid rgba(40, 170, 120, 0.9);
 }
 
 #workspaces button:hover {
@@ -69,6 +69,11 @@ window#waybar.empty #window {
 #battery {
 	color: #859900;
 }
+
+#battery.charging {
+  color: #00f923;
+}
+
 #disk {
 	color: #b58900;
 }