diff --git a/waybar.d/config b/waybar.d/config
index 85befba..6298d8c 100644
--- a/waybar.d/config
+++ b/waybar.d/config
@@ -28,11 +28,10 @@
     "custom/separator#center",
     "memory",
     "custom/separator#center",
+    "custom/separator#space",
     "temperature",
     "custom/separator#space",
     "custom/separator#center",
-    "battery",
-    "custom/separator#center",
     "custom/separator#space",
     "tray"
   ],
@@ -48,25 +47,8 @@
   "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/media": {
-    "format": "{icon} {}",
+    "format": "{0} {1}",
     "tooltip-format": "{}",
     "tooltip": true,
     "return-type": "json",
@@ -139,7 +121,7 @@
     "format-icons": ["", "", "", "", ""]
   },
   "temperature": {
-    "thermal-zone": 2,
+    "thermal-zone": 0,
     "critical-threshold": 60,
     "format-icons": ["", ""],
     "format": "<span foreground='#ebdbb2'>{icon}</span>{temperatureC:3}°C"