diff --git a/waybar.d/config b/waybar.d/config
index 70df3a4..7be4c4b 100644
--- a/waybar.d/config
+++ b/waybar.d/config
@@ -25,9 +25,8 @@
   ],
   "modules-right": [
     "custom/separator#right",
-    "network#wl0",
     "network#en0",
-    "network#vpn0",
+    "network#wl0",
     "custom/separator#right",
     "cpu",
     "memory",
@@ -149,6 +148,21 @@
     "format-charging": "<span foreground='#268bd2'></span>{capacity:3}%",
     "format-icons": ["", "", "", "", ""]
   },
+  "network#en0": {
+    "interval": 2,
+    "interface": "en0",
+    "format": "{ifname}",
+    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
+    "min-length": 8,
+    "max-length": 30,
+    "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-disconnected": "{ifname} disconnected",
+    "on-click": "foot -T float nmtui"
+  },
   "network#wl0": {
     "interval": 2,
     "interface": "wl0",
@@ -158,34 +172,9 @@
     "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
     "min-length": 8,
     "max-length": 30,
-    "tooltip-format": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-linked": "{ifname} linked",
-    "tooltip-format-disconnected": "{ifname} disconnected",
-    "on-click": "foot -T float nmtui"
-  },
-  "network#en0": {
-    "interval": 2,
-    "interface": "en0",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength:3}%)",
-    "format-ethernet": "<span foreground='#ebdbb2'> </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",
-    "on-click": "foot -T float nmtui"
-  },
-  "network#vpn0": {
-    "interval": 2,
-    "interface": "vpn0",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength:3}%)",
-    "format-ethernet": "<span foreground='#ebdbb2'> </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-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
     "tooltip-format-disconnected": "{ifname} disconnected",
     "on-click": "foot -T float nmtui"
   },
diff --git a/waybar.d/config_7DPQTN2 b/waybar.d/config_7DPQTN2
index cdf26f4..592c835 100644
--- a/waybar.d/config_7DPQTN2
+++ b/waybar.d/config_7DPQTN2
@@ -24,10 +24,10 @@
     // "custom/separator#right",
     // "custom/mail",
     // "custom/separator#right",
-    "network#wl0",
     "network#en0",
     "network#en1",
     "network#en2",
+    "network#wl0",
     "network#vpn0",
     "custom/separator#right",
     "cpu",
@@ -150,6 +150,51 @@
     "format-charging": "<span foreground='#268bd2'></span>{capacity:3}%",
     "format-icons": ["", "", "", "", ""]
   },
+  "network#en0": {
+    "interval": 2,
+    "interface": "en0",
+    "format": "{ifname}",
+    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
+    "min-length": 8,
+    "max-length": 30,
+    "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-disconnected": "{ifname} disconnected",
+    "on-click": "foot -T float nmtui"
+  },
+  "network#en1": {
+    "interval": 2,
+    "interface": "en1",
+    "format": "{ifname}",
+    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
+    "min-length": 8,
+    "max-length": 30,
+    "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-disconnected": "{ifname} disconnected",
+    "on-click": "foot -T float nmtui"
+  },
+  "network#en2": {
+    "interval": 2,
+    "interface": "en2",
+    "format": "{ifname}",
+    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
+    "min-length": 8,
+    "max-length": 30,
+    "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-disconnected": "{ifname} disconnected",
+    "on-click": "foot -T float nmtui"
+  },
   "network#wl0": {
     "interval": 2,
     "interface": "wl0",
@@ -159,47 +204,9 @@
     "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
     "min-length": 8,
     "max-length": 30,
-    "tooltip-format": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-linked": "{ifname} linked",
-    "tooltip-format-disconnected": "{ifname} disconnected",
-    "on-click": "foot -T float nmtui"
-  },
-  "network#en0": {
-    "interval": 2,
-    "interface": "en0",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength:3}%)",
-    "format-ethernet": "<span foreground='#ebdbb2'> </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",
-    "on-click": "foot -T float nmtui"
-  },
-  "network#en1": {
-    "interval": 2,
-    "interface": "en1",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength:3}%)",
-    "format-ethernet": "<span foreground='#ebdbb2'> </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",
-    "on-click": "foot -T float nmtui"
-  },
-  "network#en2": {
-    "interval": 2,
-    "interface": "en2",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength:3}%)",
-    "format-ethernet": "<span foreground='#ebdbb2'> </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-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
     "tooltip-format-disconnected": "{ifname} disconnected",
     "on-click": "foot -T float nmtui"
   },
@@ -207,12 +214,14 @@
     "interval": 2,
     "interface": "vpn0",
     "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength:3}%)",
-    "format-ethernet": "<span foreground='#ebdbb2'> </span>{ifname}",
-    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
     "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
+    "min-length": 8,
+    "max-length": 30,
     "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-linked": "{ifname} linked",
+    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
     "tooltip-format-disconnected": "{ifname} disconnected",
     "on-click": "foot -T float nmtui"
   },
diff --git a/waybar.d/config_annoyance b/waybar.d/config_annoyance
index 08b01a0..398c610 100644
--- a/waybar.d/config_annoyance
+++ b/waybar.d/config_annoyance
@@ -16,18 +16,17 @@
     "custom/media",
     "custom/separator#center",
     "pulseaudio",
-    "custom/separator#center",
-    "custom/card",
-    "custom/separator#center",
-    "custom/mail",
+    // "custom/separator#center",
+    // "custom/card",
+    // "custom/separator#center",
+    // "custom/mail",
     "custom/separator#left",
     "custom/separator#space"
   ],
   "modules-right": [
     "custom/separator#right",
-    // "network#wl0",
     "network#en0",
-    // "network#vpn0",
+    // "network#wl0",
     "custom/separator#right",
     "cpu",
     "memory",
@@ -149,6 +148,21 @@
     "format-charging": "<span foreground='#268bd2'></span>{capacity:3}%",
     "format-icons": ["", "", "", "", ""]
   },
+  "network#en0": {
+    "interval": 2,
+    "interface": "en0",
+    "format": "{ifname}",
+    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
+    "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
+    "min-length": 8,
+    "max-length": 30,
+    "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-disconnected": "{ifname} disconnected",
+    "on-click": "foot -T float nmtui"
+  },
   "network#wl0": {
     "interval": 2,
     "interface": "wl0",
@@ -158,34 +172,9 @@
     "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
     "min-length": 8,
     "max-length": 30,
-    "tooltip-format": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-linked": "{ifname} linked",
-    "tooltip-format-disconnected": "{ifname} disconnected",
-    "on-click": "foot -T float nmtui"
-  },
-  "network#en0": {
-    "interval": 2,
-    "interface": "en0",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength:3}%)",
-    "format-ethernet": "<span foreground='#ebdbb2'> </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",
-    "on-click": "foot -T float nmtui"
-  },
-  "network#vpn0": {
-    "interval": 2,
-    "interface": "vpn0",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span> {essid} ({signalStrength:3}%)",
-    "format-ethernet": "<span foreground='#ebdbb2'> </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-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
+    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
     "tooltip-format-disconnected": "{ifname} disconnected",
     "on-click": "foot -T float nmtui"
   },