diff --git a/setwll b/setwll
index 5dae995..6f512ba 100755
--- a/setwll
+++ b/setwll
@@ -67,7 +67,7 @@ fi
 if [ "$WAYLAND_DISPLAY" ]; then
     if [ "$XDG_CURRENT_DESKTOP" == "sway:wlroots" ]; then
         PID=$(pidof swaybg)
-        swaybg -o HDMI-A-1 -i $primary -m fill -o DP-1 -i $secondary -m fill & disown
+        swaybg -o HDMI-A-1 -i "$primary" -m fill -o DP-1 -i "$secondary" -m fill & disown
         sleep 0.4s
         kill $PID
     else
diff --git a/targets/waybar.sh b/targets/waybar.sh
index bc56d5e..ac3dcae 100755
--- a/targets/waybar.sh
+++ b/targets/waybar.sh
@@ -1,50 +1,65 @@
 fileout="$HOME/.config/waybar/style.css"
 
 printf "* {
-  font-family: JetbrainsMono Nerd Font;
-  font-size: 13px;
-  min-height: 0;
-  padding-right: 2px;
-  padding-left: 2px;
-  padding-bottom: 0px;
+    font-family: 'JetbrainsMono Nerd Font', 'B612 Mono', 'monospace';
+
+    font-size: 14px;
+    min-height: 0;
+    padding: 0px;
+    padding-right: 2px;
+    padding-left: 2px;
 }
 
 #waybar {
-  background: transparent;
-  color: $color7;
-  margin: 2px 2px;
+background: transparent;
+color: $color7;
 }
 
 #workspaces {
-  border-radius: 5px;
-  margin: 5px;
-  background: $color0;
-  margin-left: 2px;
+background: $color0;
+margin-bottom: 4px;
 }
 
 #workspaces button {
-  color: $color5;
-  border-radius: 5px;
-  padding: 0.4rem;
+color: $color4;
 }
 
 #workspaces button.active {
-  color: $color14;
-  border-radius: 5px;
+color: $color14;
+}
+
+#workspaces button.visible {
+color: $color14;
+}
+
+#workspaces button.empty {
+color: $color5;
 }
 
 #workspaces button.focused {
-  color: $color14;
-  border-radius: 5px;
+color: $color14;
 }
 
+
 button {
-  background: transparent;
+    background: transparent;
 }
 
 #workspaces button:hover {
-  background: $color8;
-  border: 0px solid transparent;
+background: $color8;
+border: 1px solid transparent;
+}
+
+#custom-ws_end_arrow,
+#custom-mod_end_arrow {
+color: $color0;
+padding-left: 0px;
+margin-bottom: 6px;
+}
+
+#custom-mod_end_arrow {
+padding-right: 0px;
+margin-bottom: 1px;
 }
 
 #custom-music,
@@ -63,110 +78,102 @@ button {
 #custom-rss,
 #custom-disc,
 #custom-mic,
+#custom-wifi,
 #custom-docker {
-  background-color: $color0;
-  padding: 0.5rem 1rem;
-  margin: 5px 0;
+background-color: $color0;
+margin-bottom: 4px;
 }
 
 #clock {
-  color: $color4;
-  border-radius: 0px;
+color: $color4;
 }
 
 #custom-weather {
-  color: $color4;
-  margin-left: 0.5rem;
-  border-radius: 5px;
+color: $color4;
 }
 
 #battery {
-  color: #a6d189;
+color: #a6d189;
 }
 
 #battery.charging {
-  color: #a6d189;
+color: #a6d189;
 }
 
 #battery.warning:not(.charging) {
-  color: #e78284;
+color: #e78284;
 }
 
 #backlight {
-  color: #e5c890;
-}
-
-#backlight,
-#battery {
-  border-radius: 0;
+color: #e5c890;
 }
 
 #pulseaudio {
-  color: $color9;
+color: $color9;
 }
 
 #custom-mic{
-  color: $color9;
-  border-radius: 5px 0px 0px 5px;
+color: $color9;
+padding-left: 10px;
 }
 
 #custom-docker {
-  color: $color4;
+color: $color4;
 }
 
 #custom-music {
-  color: #ca9ee6;
-  border-radius: 5px;
+color: #ca9ee6;
 }
 
 #custom-lock {
-  color: #babbf1;
+color: #babbf1;
+padding-right: 1rem;
 }
 
 #custom-power {
-  margin-right: 1rem;
-  border-radius: 0px 5px 5px 0px;
-  color: #e78284;
+padding-right: 1rem;
+padding-left: 1px;
+color: #e78284;
 }
 
 #custom-docker.docker {
-  color: #85c1dc;
+color: #85c1dc;
 }
 
 #custom-docker.docker-none {
-  color: #737994;
+color: #737994;
 }
 
 #custom-docker.docker-error {
-  color: #e78284;
+color: #e78284;
 }
 
 #custom-weather.clear {
-  color: #e5c890; /* Sunny yellow */
+color: #e5c890; /* Sunny yellow */
 }
 
 #custom-weather.cloud {
-  color: #99d1db; /* Light blue */
+color: #99d1db; /* Light blue */
 }
 
 #custom-weather.rain {
-  color: #8caaee; /* Blue */
+color: #8caaee; /* Blue */
 }
 
 #custom-weather.snow {
-  color: #c6d0f5; /* White-ish */
+color: #c6d0f5; /* White-ish */
 }
 
 #custom-weather.thunder {
-  color: #ca9ee6; /* Purple */
+color: #ca9ee6; /* Purple */
 }
 
 #custom-weather.fog {
-  color: #b0b4bc; /* Gray */
+color: #b0b4bc; /* Gray */
 }
 
 #custom-weather.error {
-  color: $color0; /* Red */
+color: $color0; /* Red */
 }" > "$fileout"
 
 sleep 0.1s