diff --git a/waybar.d/config b/waybar.d/config
index b0d7d5d..e415b75 100644
--- a/waybar.d/config
+++ b/waybar.d/config
@@ -13,29 +13,26 @@
   ],
   "modules-center": [
     "custom/separator#right",
+    "clock",
+    "custom/separator#center",
     "custom/media",
     "custom/separator#center",
     "pulseaudio",
-    // "custom/separator#center",
-    // "custom/card",
-    // "custom/separator#center",
-    // "custom/mail",
-    "custom/separator#left",
-    "custom/separator#space"
+    "custom/separator#left"
   ],
   "modules-right": [
     "custom/separator#right",
     "network#en0",
     "network#wl0",
-    "custom/separator#right",
+    "custom/separator#center",
     "cpu",
     "memory",
     "temperature",
-    "custom/separator#right",
+    "custom/separator#space",
+    "custom/separator#center",
     "battery",
-    "custom/separator#right",
-    "custom/calendar",
-    "clock",
+    "custom/separator#center",
+    "custom/separator#space",
     "tray"
   ],
   "custom/separator#left": {
@@ -68,36 +65,6 @@
     "exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null",
     "on-click": "foot -T float khal interactive"
   },
-  "custom/card": {
-    "format": "{icon} {}",
-    "tooltip-format": "{}",
-    "tooltip": true,
-    "return-type": "json",
-    "min-length": 3,
-    "max-length": 3,
-    "interval": 10,
-    "format-icons": {
-      "available": "",
-      "missing": ""
-    },
-    "escape": true,
-    "exec": "$HOME/.config/sway/bin/waybar_card.sh 2> /dev/null"
-  },
-  "custom/mail": {
-    "format": "{icon} {}",
-    "tooltip-format": "{}",
-    "tooltip": true,
-    "return-type": "json",
-    "min-length": 5,
-    "max-length": 6,
-    "interval": 30,
-    "format-icons": {
-      "unread": "",
-      "read": ""
-    },
-    "escape": true,
-    "exec": "$HOME/.config/sway/bin/waybar_mail.py 2> /dev/null"
-  },
   "custom/media": {
     "format": "{icon} {}",
     "tooltip-format": "{}",
diff --git a/waybar.d/config_annoyance b/waybar.d/config_annoyance
deleted file mode 100644
index 398c610..0000000
--- a/waybar.d/config_annoyance
+++ /dev/null
@@ -1,210 +0,0 @@
-// vi: ft=jsonc
-// normal #ebdbb2
-// blue   #268bd2
-// red    #fb4934
-// green  #b8bb26
-{
-  "layer": "top",
-  "height": 25,
-  "modules-left": [
-    "sway/workspaces",
-    "custom/separator#left",
-    "custom/separator#space"
-  ],
-  "modules-center": [
-    "custom/separator#right",
-    "custom/media",
-    "custom/separator#center",
-    "pulseaudio",
-    // "custom/separator#center",
-    // "custom/card",
-    // "custom/separator#center",
-    // "custom/mail",
-    "custom/separator#left",
-    "custom/separator#space"
-  ],
-  "modules-right": [
-    "custom/separator#right",
-    "network#en0",
-    // "network#wl0",
-    "custom/separator#right",
-    "cpu",
-    "memory",
-    "custom/separator#right",
-    // "battery",
-    // "custom/separator#right",
-    "custom/calendar",
-    "clock",
-    "tray"
-  ],
-  "custom/separator#left": {
-    "format": "<span foreground='#268bd2'>❯</span>"
-  },
-  "custom/separator#space": {
-    "format": " "
-  },
-  "custom/separator#center": {
-    // "format": "<span foreground='#268bd2'></span>"
-    "format": "<span foreground='#268bd2'>|</span>"
-  },
-  "custom/separator#right": {
-    "format": "<span foreground='#268bd2'>❮</span>"
-  },
-  "custom/calendar": {
-    "format": "{icon} {}",
-    "tooltip-format": "{}",
-    "tooltip": true,
-    "return-type": "json",
-    "min-length": 25,
-    "max-length": 40,
-    "interval": 300,
-    "format-icons": {
-      "now": "<span foreground='#fb4934'></span>",
-      "today": "<span foreground='#b8bb26'></span>",
-      "idle": ""
-    },
-    "escape": false,
-    "exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null",
-    "on-click": "foot -T float khal interactive"
-  },
-  "custom/card": {
-    "format": "{icon} {}",
-    "tooltip-format": "{}",
-    "tooltip": true,
-    "return-type": "json",
-    "min-length": 3,
-    "max-length": 3,
-    "interval": 10,
-    "format-icons": {
-      "available": "",
-      "missing": ""
-    },
-    "escape": true,
-    "exec": "$HOME/.config/sway/bin/waybar_card.sh 2> /dev/null"
-  },
-  "custom/mail": {
-    "format": "{icon} {}",
-    "tooltip-format": "{}",
-    "tooltip": true,
-    "return-type": "json",
-    "min-length": 5,
-    "max-length": 6,
-    "interval": 30,
-    "format-icons": {
-      "unread": "",
-      "read": ""
-    },
-    "escape": true,
-    "exec": "$HOME/.config/sway/bin/waybar_mail.py 2> /dev/null"
-  },
-  "custom/media": {
-    "format": "{icon} {}",
-    "tooltip-format": "{}",
-    "tooltip": true,
-    "return-type": "json",
-    "min-length": 10,
-    "max-length": 30,
-    "format-icons": {
-      "chromium": " ",
-      "firefox": " ",
-      "Plexamp": "♫ ",
-      "default": "♪ "
-    },
-    "escape": true,
-    "exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null"
-  },
-  "clock": {
-    "format": "<span foreground='#ebdbb2'></span>{: %b %d, %H:%M}",
-    "on-click": "foot -T float khal interactive"
-  },
-  "cpu": {
-    "format": "<span foreground='#ebdbb2'></span>{usage:3}%",
-    "min-length": 6,
-    "max-length": 10,
-    "states": {
-      "warning": 70,
-      "critical": 90
-    },
-    "on-click": "foot -T float bashtop"
-  },
-  "memory": {
-    "format": "<span foreground='#ebdbb2'></span>{}%",
-    "min-length": 6,
-    "max-length": 10,
-    "states": {
-      "warning": 70,
-      "critical": 90
-    },
-    "on-click": "foot -T float bashtop"
-  },
-  "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#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",
-    "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"
-  },
-  "pulseaudio": {
-    "format": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
-    "format-muted": "<span foreground='#fb4934'> </span>{format_source}",
-    "format-bluetooth": "<span foreground='#ebdbb2'>{icon}</span> {volume}% {format_source}",
-    "format-bluetooth-muted": "<span foreground='#fb4934'>{icon}</span>{format_source}",
-    "format-source": "<span foreground='#b8bb26'></span>",
-    "format-source-muted": "<span foreground='#fb4934'></span>",
-    "format-icons": {
-      "headphone": "🎧",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
-    },
-    "min-length": 7,
-    "max-length": 12,
-    "on-click": "$HOME/.config/sway/bin/sway_volume mute",
-    "on-click-middle": "$HOME/.config/sway/bin/sway_volume source-mute",
-    "on-click-right": "$HOME/.config/sway/bin/sway_volume gui",
-    "on-scroll-up": "$HOME/.config/sway/bin/sway_volume increase",
-    "on-scroll-down": "$HOME/.config/sway/bin/sway_volume decrease-mute"
-  },
-  "tray": {
-    "padding": 10,
-    "spacing": 10
-  }
-}
-
diff --git a/waybar.d/config_bslxkos02 b/waybar.d/config_bslxkos02
index 8b89555..a00d5d2 100644
--- a/waybar.d/config_bslxkos02
+++ b/waybar.d/config_bslxkos02
@@ -13,29 +13,26 @@
   ],
   "modules-center": [
     "custom/separator#right",
+    "clock",
+    "custom/separator#center",
     "custom/media",
     "custom/separator#center",
     "pulseaudio",
-    // "custom/separator#center",
-    // "custom/card",
-    // "custom/separator#center",
-    // "custom/mail",
-    "custom/separator#left",
-    "custom/separator#space"
+    "custom/separator#left"
   ],
   "modules-right": [
     "custom/separator#right",
     "network#en0",
     "network#wl0",
-    "custom/separator#right",
+    "custom/separator#center",
     "cpu",
     "memory",
     "temperature",
-    "custom/separator#right",
+    "custom/separator#space",
+    "custom/separator#center",
     // "battery",
-    // "custom/separator#right",
-    "custom/calendar",
-    "clock",
+    // "custom/separator#center",
+    "custom/separator#space",
     "tray"
   ],
   "custom/separator#left": {
@@ -68,36 +65,6 @@
     "exec": "$HOME/.config/sway/bin/waybar_khal.py 2> /dev/null",
     "on-click": "foot -T float khal interactive"
   },
-  "custom/card": {
-    "format": "{icon} {}",
-    "tooltip-format": "{}",
-    "tooltip": true,
-    "return-type": "json",
-    "min-length": 3,
-    "max-length": 3,
-    "interval": 10,
-    "format-icons": {
-      "available": "",
-      "missing": ""
-    },
-    "escape": true,
-    "exec": "$HOME/.config/sway/bin/waybar_card.sh 2> /dev/null"
-  },
-  "custom/mail": {
-    "format": "{icon} {}",
-    "tooltip-format": "{}",
-    "tooltip": true,
-    "return-type": "json",
-    "min-length": 5,
-    "max-length": 6,
-    "interval": 30,
-    "format-icons": {
-      "unread": "",
-      "read": ""
-    },
-    "escape": true,
-    "exec": "$HOME/.config/sway/bin/waybar_mail.py 2> /dev/null"
-  },
   "custom/media": {
     "format": "{icon} {}",
     "tooltip-format": "{}",