diff --git a/waybar.d/config b/waybar.d/config
index 0d436e2..c6318f7 100644
--- a/waybar.d/config
+++ b/waybar.d/config
@@ -4,175 +4,175 @@
 // red    #fb4934
 // green  #b8bb26
 {
-    "layer": "top",
-    "height": 25,
-    "modules-left": [
-        "sway/workspaces",
-        "custom/separator#left"
-    ],
-    "modules-center": [
-    ],
-    "modules-right": [
-        "custom/separator#right",
-        "custom/mail",
-        "custom/separator#right",
-        "pulseaudio",
-        "custom/media",
-        "custom/separator#right",
-        "network#wl0",
-        "network#en0",
-        "network#vpn0",
-        "custom/separator#right",
-        "cpu",
-        "memory",
-        "custom/separator#right",
-        "backlight",
-        "custom/separator#right",
-        "battery",
-        "custom/separator#right",
-        "custom/calendar",
-        "clock",
-        "tray"
-    ],
-    "custom/separator#left": {
-        "format": " <span foreground='#268bd2'>❯</span> "
+  "layer": "top",
+  "height": 25,
+  "modules-left": [
+    "sway/workspaces",
+    "custom/separator#left"
+  ],
+  "modules-center": [
+  ],
+  "modules-right": [
+    "custom/separator#right",
+    "custom/mail",
+    "custom/separator#right",
+    "pulseaudio",
+    "custom/media",
+    "custom/separator#right",
+    "network#wl0",
+    "network#en0",
+    "network#vpn0",
+    "custom/separator#right",
+    "cpu",
+    "memory",
+    "custom/separator#right",
+    "backlight",
+    "custom/separator#right",
+    "battery",
+    "custom/separator#right",
+    "custom/calendar",
+    "clock",
+    "tray"
+  ],
+  "custom/separator#left": {
+    "format": " <span foreground='#268bd2'>❯</span> "
+  },
+  "custom/separator#right": {
+    "format": " <span foreground='#268bd2'>❮</span> "
+  },
+  "custom/calendar": {
+    "format": "{}",
+    "tooltip-format": "{}",
+    "tooltip": true,
+    "return-type": "json",
+    "interval": 300,
+    "escape": false,
+    "exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null",
+    "on-click": "foot -T float khal interactive"
+  },
+  "custom/mail": {
+    "format": "{icon} {}",
+    "return-type": "json",
+    "min-length": 15,
+    "max-length": 15,
+    "interval": 30,
+    "format-icons": {
+      "unread": " ",
+      "read": " "
     },
-    "custom/separator#right": {
-        "format": " <span foreground='#268bd2'>❮</span> "
+    "escape": true,
+    "exec": "$HOME/.config/sway/bin/waybar_mail 2> /dev/null"
+  },
+  "custom/media": {
+    "format": "{icon} {}",
+    "return-type": "json",
+    "min-length": 30,
+    "max-length": 40,
+    "format-icons": {
+      "chromium": " ",
+      "firefox": " ",
+      "Plexamp": " ",
+      "default": "♫ "
     },
-    "custom/calendar": {
-      "format": "{}",
-      "tooltip-format": "{}",
-      "tooltip": true,
-      "return-type": "json",
-      "interval": 300,
-      "escape": false,
-      "exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null",
-      "on-click": "foot -T float khal interactive"
+    "escape": true,
+    "exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null",
+    "exec-if": "pgrep plexamp"
+  },
+  "clock": {
+    "format": "<span foreground='#ebdbb2'> </span>{:%H:%M}",
+    "on-click": "foot -T float khal interactive"
+  },
+  "cpu": {
+    "format": "<span foreground='#ebdbb2'></span> {usage:3}%",
+    "states": {
+      "warning": 70,
+      "critical": 90
     },
-    "custom/mail": {
-      "format": "{icon} {}",
-      "return-type": "json",
-      "min-length": 15,
-      "max-length": 15,
-      "interval": 30,
-      "format-icons": {
-        "unread": " ",
-        "read": " "
-      },
-      "escape": true,
-      "exec": "$HOME/.config/sway/bin/waybar_mail 2> /dev/null"
+    "on-click": "foot -T float bashtop"
+  },
+  "memory": {
+    "format": "<span foreground='#ebdbb2'></span> {}%",
+    "states": {
+      "warning": 70,
+      "critical": 90
     },
-    "custom/media": {
-      "format": "{icon} {}",
-      "return-type": "json",
-      "min-length": 30,
-      "max-length": 40,
-      "format-icons": {
-        "chromium": " ",
-        "firefox": " ",
-        "Plexamp": " ",
-        "default": "♫ "
-      },
-      "escape": true,
-      "exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null",
-      "exec-if": "pgrep plexamp"
+    "on-click": "foot -T float bashtop"
+  },
+  "backlight": {
+    "format": "<span foreground='#ebdbb2'>{icon}</span> {percent:3}%",
+    "format-icons": [""]
+  },
+  "battery": {
+    "bat": "BAT0",
+    "design-capacity": false,
+    "states": {
+      "warning": 30,
+      "critical": 15
     },
-    "clock": {
-        "format": "<span foreground='#ebdbb2'> </span>{:%H:%M}",
-        "on-click": "foot -T float khal interactive"
+    "format": "<span foreground='#ebdbb2'>{icon}</span> {capacity:3}%",
+    "format-charging": "<span foreground='#268bd2'></span> {capacity:3}%",
+    "format-icons": ["", "", "", "", ""]
+  },
+  "network#wl0": {
+    "interval": 2,
+    "interface": "wl0",
+    "format": "{ifname}",
+    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname} {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#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-disconnected": "{ifname} disconnected",
+    "on-click": "foot -T float nmtui"
+  },
+  "pulseaudio": {
+    "format": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
+    "format-bluetooth": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
+    "format-bluetooth-muted": "<span foreground='#fb4934'> {icon} </span>{format_source}",
+    "format-muted": "<span foreground='#fb4934'> </span>{format_source}",
+    "format-source": "<span foreground='#b8bb26'> </span>{volume}%",
+    "format-source-muted": "<span foreground='#fb4934'> </span>",
+    "format-icons": {
+      "headphone": "🎧",
+      "hands-free": "",
+      "headset": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": ["", "", ""]
     },
-    "cpu": {
-        "format": "<span foreground='#ebdbb2'></span> {usage:3}%",
-        "states": {
-            "warning": 70,
-            "critical": 90
-        },
-        "on-click": "foot -T float bashtop"
-    },
-    "memory": {
-        "format": "<span foreground='#ebdbb2'></span> {}%",
-        "states": {
-            "warning": 70,
-            "critical": 90
-        },
-        "on-click": "foot -T float bashtop"
-    },
-    "backlight": {
-        "format": "<span foreground='#ebdbb2'>{icon}</span> {percent:3}%",
-        "format-icons": [""]
-    },
-    "battery": {
-        "bat": "BAT0",
-        "design-capacity": false,
-        "states": {
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "<span foreground='#ebdbb2'>{icon}</span> {capacity:3}%",
-        "format-charging": "<span foreground='#268bd2'></span> {capacity:3}%",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "network#wl0": {
-        "interval": 2,
-        "interface": "wl0",
-        "format": "{ifname}",
-        "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname} {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#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-disconnected": "{ifname} disconnected",
-        "on-click": "foot -T float nmtui"
-    },
-    "pulseaudio": {
-        "format": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
-        "format-bluetooth": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
-        "format-bluetooth-muted": "<span foreground='#fb4934'> {icon} </span>{format_source}",
-        "format-muted": "<span foreground='#fb4934'> </span>{format_source}",
-        "format-source": "<span foreground='#b8bb26'> </span>{volume}%",
-        "format-source-muted": "<span foreground='#fb4934'> </span>",
-        "format-icons": {
-            "headphone": "🎧",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pkill -x pavucontrol || pavucontrol"
-    },
-    "tray": {
-      "padding": 10,
-      "spacing": 10
-    }
+    "on-click": "pkill -x pavucontrol || pavucontrol"
+  },
+  "tray": {
+    "padding": 10,
+    "spacing": 10
+  }
 }
 
diff --git a/waybar.d/config_annoyance b/waybar.d/config_annoyance
index 9f0157a..973c2c5 100644
--- a/waybar.d/config_annoyance
+++ b/waybar.d/config_annoyance
@@ -4,38 +4,38 @@
 // red    #fb4934
 // green  #b8bb26
 {
-    "layer": "top",
-    "height": 25,
-    "modules-left": [
-        "sway/workspaces",
-        "custom/separator#left"
-    ],
-    "modules-center": [
-    ],
-    "modules-right": [
-        "custom/separator#right",
-        "custom/mail",
-        "custom/separator#right",
-        "pulseaudio",
-        "custom/media",
-        "custom/separator#right",
-        "network#en0",
-        "network#vpn0",
-        "custom/separator#right",
-        "cpu",
-        "memory",
-        "custom/separator#right",
-        "backlight",
-        "custom/separator#right",
-        "custom/calendar",
-        "clock",
-        "tray"
+  "layer": "top",
+  "height": 25,
+  "modules-left": [
+    "sway/workspaces",
+    "custom/separator#left"
+  ],
+  "modules-center": [
+  ],
+  "modules-right": [
+    "custom/separator#right",
+    "custom/mail",
+    "custom/separator#right",
+    "pulseaudio",
+    "custom/media",
+    "custom/separator#right",
+    "network#en0",
+    "network#vpn0",
+    "custom/separator#right",
+    "cpu",
+    "memory",
+    "custom/separator#right",
+    "backlight",
+    "custom/separator#right",
+    "custom/calendar",
+    "clock",
+    "tray"
     ],
     "custom/separator#left": {
-        "format": " <span foreground='#268bd2'>❯</span> "
+      "format": " <span foreground='#268bd2'>❯</span> "
     },
     "custom/separator#right": {
-        "format": " <span foreground='#268bd2'>❮</span> "
+      "format": " <span foreground='#268bd2'>❮</span> "
     },
     "custom/calendar": {
       "format": "{}",
@@ -76,96 +76,96 @@
       "exec-if": "pgrep plexamp"
     },
     "clock": {
-        "format": "<span foreground='#ebdbb2'> </span>{:%H:%M}",
-        "on-click": "foot -T float khal interactive"
+      "format": "<span foreground='#ebdbb2'> </span>{:%H:%M}",
+      "on-click": "foot -T float khal interactive"
     },
     "cpu": {
-        "format": "<span foreground='#ebdbb2'></span> {usage:3}%",
-        "states": {
-            "warning": 70,
-            "critical": 90
-        },
-        "on-click": "foot -T float bashtop"
+      "format": "<span foreground='#ebdbb2'></span> {usage:3}%",
+      "states": {
+        "warning": 70,
+        "critical": 90
+      },
+      "on-click": "foot -T float bashtop"
     },
     "memory": {
-        "format": "<span foreground='#ebdbb2'></span> {}%",
-        "states": {
-            "warning": 70,
-            "critical": 90
-        },
-        "on-click": "foot -T float bashtop"
+      "format": "<span foreground='#ebdbb2'></span> {}%",
+      "states": {
+        "warning": 70,
+        "critical": 90
+      },
+      "on-click": "foot -T float bashtop"
     },
     "backlight": {
-        "format": "<span foreground='#ebdbb2'>{icon}</span> {percent:3}%",
-        "format-icons": [""]
+      "format": "<span foreground='#ebdbb2'>{icon}</span> {percent:3}%",
+      "format-icons": [""]
     },
     "battery": {
-        "bat": "BAT0",
-        "design-capacity": false,
-        "states": {
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "<span foreground='#ebdbb2'>{icon}</span> {capacity:3}%",
-        "format-charging": "<span foreground='#268bd2'></span> {capacity:3}%",
-        "format-icons": ["", "", "", "", ""]
+      "bat": "BAT0",
+      "design-capacity": false,
+      "states": {
+        "warning": 30,
+        "critical": 15
+      },
+      "format": "<span foreground='#ebdbb2'>{icon}</span> {capacity:3}%",
+      "format-charging": "<span foreground='#268bd2'></span> {capacity:3}%",
+      "format-icons": ["", "", "", "", ""]
     },
     "network#wl0": {
-        "interval": 2,
-        "interface": "wl0",
-        "format": "{ifname}",
-        "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname} {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"
+      "interval": 2,
+      "interface": "wl0",
+      "format": "{ifname}",
+      "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname} {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#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"
+      "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-disconnected": "{ifname} disconnected",
-        "on-click": "foot -T float nmtui"
+      "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-disconnected": "{ifname} disconnected",
+      "on-click": "foot -T float nmtui"
     },
     "pulseaudio": {
-        "format": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
-        "format-bluetooth": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
-        "format-bluetooth-muted": "<span foreground='#fb4934'> {icon} </span>{format_source}",
-        "format-muted": "<span foreground='#fb4934'> </span>{format_source}",
-        "format-source": "<span foreground='#b8bb26'> </span>{volume}%",
-        "format-source-muted": "<span foreground='#fb4934'> </span>",
-        "format-icons": {
-            "headphone": "🎧",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pkill -x pavucontrol || pavucontrol"
+      "format": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
+      "format-bluetooth": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
+      "format-bluetooth-muted": "<span foreground='#fb4934'> {icon} </span>{format_source}",
+      "format-muted": "<span foreground='#fb4934'> </span>{format_source}",
+      "format-source": "<span foreground='#b8bb26'> </span>{volume}%",
+      "format-source-muted": "<span foreground='#fb4934'> </span>",
+      "format-icons": {
+        "headphone": "🎧",
+        "hands-free": "",
+        "headset": "",
+        "phone": "",
+        "portable": "",
+        "car": "",
+        "default": ["", "", ""]
+      },
+      "on-click": "pkill -x pavucontrol || pavucontrol"
     },
     "tray": {
       "padding": 10,