diff --git a/waybar.d/config b/waybar.d/config
index b6277c6..8f36dbd 100644
--- a/waybar.d/config
+++ b/waybar.d/config
@@ -3,38 +3,42 @@
     "layer": "top",
     "height": 25,
     "modules-left": [
-        "sway/workspaces"
+        "sway/workspaces",
+        "custom/separator#left"
     ],
     "modules-center": [
-      "sway/window"
     ],
     "modules-right": [
-        "custom/separator",
+        "custom/separator#right",
         "custom/mail",
-        "custom/separator",
+        "custom/separator#right",
         "pulseaudio",
         "custom/media",
-        "custom/separator",
+        "custom/separator#right",
         "network#wl0",
         "network#en0",
         "network#vpn0",
-        "custom/separator",
+        "custom/separator#right",
         "cpu",
         "memory",
-        "custom/separator",
+        "custom/separator#right",
         "backlight",
-        "custom/separator",
+        "custom/separator#right",
         "battery",
-        "custom/separator",
+        "custom/separator#right",
         "clock",
         "tray"
     ],
-    "custom/separator": {
+    "custom/separator#left": {
+        "format": " <span foreground='#268bd2'>❯</span> "
+    },
+    "custom/separator#right": {
         "format": " <span foreground='#268bd2'>❮</span> "
     },
     "custom/mail": {
       "format": "{icon} {}",
       "return-type": "json",
+      "min-length": 15,
       "max-length": 15,
       "interval": 30,
       "format-icons": {
@@ -47,6 +51,7 @@
     "custom/media": {
       "format": "{icon} {}",
       "return-type": "json",
+      "min-length": 30,
       "max-length": 40,
       "format-icons": {
         "chromium": " ",
@@ -97,8 +102,8 @@
         "format": "{ifname}",
         "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname} {essid} ({signalStrength}%)",
         "format-ethernet": "<span foreground='#ebdbb2'> </span>{ifname}",
-        "format-linked": "<span foreground='#606060'> </span>{ifname}",
-        "format-disconnected": "<span foreground='#fb4934'> </span>{ifname} ",
+        "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+        "format-disconnected": "<span foreground='#606060'></span>{ifname}",
         "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
         "tooltip-format-linked": "{ifname} linked",
         "tooltip-format-disconnected": "{ifname} disconnected",
@@ -110,8 +115,8 @@
         "format": "{ifname}",
         "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength}%)",
         "format-ethernet": "<span foreground='#ebdbb2'> </span>{ifname}",
-        "format-linked": "<span foreground='#606060'> </span>{ifname}",
-        "format-disconnected": "<span foreground='#fb4934'> </span>{ifname}",
+        "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+        "format-disconnected": "<span foreground='#606060'></span>{ifname}",
         "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
         "tooltip-format-linked": "{ifname} linked",
         "tooltip-format-disconnected": "{ifname} disconnected",
@@ -123,8 +128,8 @@
         "format": "{ifname}",
         "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength}%)",
         "format-ethernet": "<span foreground='#ebdbb2'> </span>{ifname}",
-        "format-linked": "<span foreground='#606060'> </span>{ifname}",
-        "format-disconnected": "<span foreground='#fb4934'> </span> {ifname}",
+        "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+        "format-disconnected": "<span foreground='#606060'></span>{ifname}",
         "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
         "tooltip-format-linked": "{ifname} linked",
         "tooltip-format-disconnected": "{ifname} disconnected",
diff --git a/waybar.d/config_annoyance b/waybar.d/config_annoyance
index edeb34d..3abfc1b 100644
--- a/waybar.d/config_annoyance
+++ b/waybar.d/config_annoyance
@@ -3,35 +3,39 @@
     "layer": "top",
     "height": 25,
     "modules-left": [
-        "sway/workspaces"
+        "sway/workspaces",
+        "custom/separator#left"
     ],
     "modules-center": [
-      "sway/window"
     ],
     "modules-right": [
-        "custom/separator",
+        "custom/separator#right",
         "custom/mail",
-        "custom/separator",
+        "custom/separator#right",
         "pulseaudio",
         "custom/media",
-        "custom/separator",
+        "custom/separator#right",
         "network#en0",
         "network#vpn0",
-        "custom/separator",
+        "custom/separator#right",
         "cpu",
         "memory",
-        "custom/separator",
+        "custom/separator#right",
         "backlight",
-        "custom/separator",
+        "custom/separator#right",
         "clock",
         "tray"
     ],
-    "custom/separator": {
-        "format": "<span foreground='#268bd2'>❮</span>"
+    "custom/separator#left": {
+        "format": " <span foreground='#268bd2'>❯</span> "
+    },
+    "custom/separator#right": {
+        "format": " <span foreground='#268bd2'>❮</span> "
     },
     "custom/mail": {
       "format": "{icon} {}",
       "return-type": "json",
+      "min-length": 15,
       "max-length": 15,
       "interval": 30,
       "format-icons": {
@@ -44,6 +48,7 @@
     "custom/media": {
       "format": "{icon} {}",
       "return-type": "json",
+      "min-length": 30,
       "max-length": 40,
       "format-icons": {
         "chromium": " ",
@@ -79,7 +84,7 @@
     },
     "battery": {
         "bat": "BAT0",
-        "design-capacity": true,
+        "design-capacity": false,
         "states": {
             "warning": 30,
             "critical": 15
@@ -88,14 +93,14 @@
         "format-charging": "<span foreground='#fb4934'></span> {capacity}%",
         "format-icons": ["", "", "", "", ""]
     },
-    "network#wl0": {
+{
         "interval": 2,
         "interface": "wl0",
         "format": "{ifname}",
         "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname} {essid} ({signalStrength}%)",
         "format-ethernet": "<span foreground='#ebdbb2'> </span>{ifname}",
         "format-linked": "<span foreground='#606060'> </span>{ifname}",
-        "format-disconnected": "<span foreground='#fb4934'> </span>{ifname} ",
+        "format-disconnected": "<span foreground='#606060'></span>{ifname}",
         "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
         "tooltip-format-linked": "{ifname} linked",
         "tooltip-format-disconnected": "{ifname} disconnected",
@@ -108,7 +113,7 @@
         "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength}%)",
         "format-ethernet": "<span foreground='#ebdbb2'> </span>{ifname}",
         "format-linked": "<span foreground='#606060'> </span>{ifname}",
-        "format-disconnected": "<span foreground='#fb4934'> </span>{ifname}",
+        "format-disconnected": "<span foreground='#606060'></span>{ifname}",
         "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
         "tooltip-format-linked": "{ifname} linked",
         "tooltip-format-disconnected": "{ifname} disconnected",
@@ -121,7 +126,7 @@
         "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength}%)",
         "format-ethernet": "<span foreground='#ebdbb2'> </span>{ifname}",
         "format-linked": "<span foreground='#606060'> </span>{ifname}",
-        "format-disconnected": "<span foreground='#fb4934'> </span> {ifname}",
+        "format-disconnected": "<span foreground='#606060'></span>{ifname}",
         "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
         "tooltip-format-linked": "{ifname} linked",
         "tooltip-format-disconnected": "{ifname} disconnected",
diff --git a/waybar.d/style.css b/waybar.d/style.css
index 6d2db53..10ad694 100644
--- a/waybar.d/style.css
+++ b/waybar.d/style.css
@@ -23,6 +23,7 @@ window#waybar {
 
 #workspaces button {
   padding: 0 10px;
+  min-width: 60px;
   background: transparent;
   color: @foreground;
   border-bottom: 3px solid transparent;
@@ -44,12 +45,15 @@ window#waybar {
 #cpu,
 #custom-media,
 #memory,
-#network,
 #pulseaudio,
 #workspaces {
   padding: 0 6px;
   margin: 0 6px;
 }
+#network {
+  padding: 0 2px;
+  margin: 0 2px;
+}
 
 /* good */
 #battery.full {