diff --git a/waybar/config.template b/waybar/config.template
index 42f0203ab..a34374568 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -22,87 +22,9 @@
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
-},{
-    // LAUNCHER
-    "name": "launcher",
-    "output": __OUTPUT__,
-    "ipc": true,
-    "id": "bar-1",
-    "mode": "hide",
-    "hidden_state": "hide",
-    "layer": "top", // Waybar at top layer
-    "position": "bottom", // Waybar position (top|bottom|left|right)
-    "margin-left": 20,
-    "margin-right": 20,
-    "margin-bottom": 20,
-    "modules-left": ["custom/launcher"],
-    "modules-center": [],
-    "modules-right": ["tray", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "idle_inhibitor", "custom/clock", "custom/power"],
-    // Modules configuration
-    "custom/launcher": {
-        "format": "",
-        "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else rofi -config ${HOME}/.config/rofi/config.rasi -show drun -lines 20; fi"
-    },
-    //"mpd": {
-        //"server": "10.10.0.66",
-	//"port": 6600,
-	//"interval": 10,
-	//"timeout": 30,
-	//"unknown-tag": "⚠",
-	//"format": "▶️{title}",
-	//"format-paused": "⏸️{title}",
-	//"format-stopped": "⏹️ mpd",
-	//"format-disconnected": "⚠ mpd",
-        //"on-click": "${HOME}/scripts/waybar/waybar-mpd.sh"
-    //},
-    "tray": {
-        "icon-size": 28,
-        "spacing": 10
-    },
-    "custom/todo": {
-        "format": "🗈",
-        "on-click": "${HOME}/scripts/waybar/waybar-todo.sh",
-	"tooltip": false
-    },
-    "custom/osk": {
-        "format": "⌨",
-        "on-click": "${HOME}/scripts/waybar/waybar-keyboard.sh",
-	"tooltip": false
-    },
-    "custom/pkg": {
-        "interval": 60,
-	"tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>",
-        "on-click": "${HOME}/scripts/waybar/waybar-pkg.sh upgrade",
-	"return-type": "json",
-        "exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar"
-    },
-    "custom/bar": {
-        "format": "",
-	"tooltip": false,
-	"on-click": "${HOME}/scripts/waybar/toggle.sh"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        },
-	"on-click": "echo {status} > .config/idle_inhibitor"
-    },
-    "custom/clock": {
-        "interval": 60,
-	"tooltip": true,
-        "on-click": "${HOME}/.local/bin/firefox/firefox-bin https://papillon.john.me.tz/calendar.php",
-	"return-type": "json",
-        "exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'"
-    },
-    "custom/power": {
-        "format": "\u23FB",
-        "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else ${HOME}/scripts/rofi/rofi-power-menu.sh; fi"
-    },
 },
 {
-    "name": "status",
+    "name": "bar",
     "output": __OUTPUT__,
     "ipc": true,
     "id": "bar-1",
@@ -116,7 +38,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces"],
     "modules-center": [],
-    "modules-right": ["custom/weather", "network", "network#wireguard", "cpu", "memory", "custom/disk", "temperature", "backlight", "custom/battery", "pulseaudio"],
+    "modules-right": ["custom/weather", "network", "network#wireguard", "cpu", "memory", "custom/disk", "temperature", "backlight", "custom/battery", "pulseaudio","tray", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "idle_inhibitor", "custom/clock", "custom/power"],
     // Modules configuration
     "sway/workspaces": {
         // "disable-scroll": true,
@@ -235,4 +157,49 @@
         },
         "on-click": "${HOME}/scripts/waybar/waybar-audio.sh"
     },
+    "tray": {
+        "icon-size": 28,
+        "spacing": 10
+    },
+    "custom/todo": {
+        "format": "🗈",
+        "on-click": "${HOME}/scripts/waybar/waybar-todo.sh",
+	"tooltip": false
+    },
+    "custom/osk": {
+        "format": "⌨",
+        "on-click": "${HOME}/scripts/waybar/waybar-keyboard.sh",
+	"tooltip": false
+    },
+    "custom/pkg": {
+        "interval": 60,
+	"tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>",
+        "on-click": "${HOME}/scripts/waybar/waybar-pkg.sh upgrade",
+	"return-type": "json",
+        "exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar"
+    },
+    "custom/bar": {
+        "format": "\u200a",
+	"tooltip": false,
+	"on-click": "${HOME}/scripts/waybar/toggle.sh"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        },
+	"on-click": "echo {status} > .config/idle_inhibitor"
+    },
+    "custom/clock": {
+        "interval": 60,
+	"tooltip": true,
+        "on-click": "${HOME}/.local/bin/firefox/firefox-bin https://papillon.john.me.tz/calendar.php",
+	"return-type": "json",
+        "exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'"
+    },
+    "custom/power": {
+        "format": "\u23FB",
+        "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else ${HOME}/scripts/rofi/rofi-power-menu.sh; fi"
+    },
 }]