diff --git a/configs/hyprland/hypr/configs/autostart.conf b/configs/hyprland/hypr/configs/autostart.conf
index b423b2f..b2fa206 100644
--- a/configs/hyprland/hypr/configs/autostart.conf
+++ b/configs/hyprland/hypr/configs/autostart.conf
@@ -10,7 +10,7 @@ exec-once = wl-paste --watch cliphist store &
 exec-once = ~/.config/hypr/scripts/startup/dunst.sh &
 exec-once = ~/.config/hypr/scripts/wallpaper/wallpaper-daemon.sh &
 exec-once = ~/.config/hypr/scripts/startup/swayosd.sh &
-exec-once = ~/.config/hypr/scripts/startup/waybar.sh &
+exec-once = ~/.config/hypr/scripts/waybar/start.sh &
 
 # exec-once = avizo-service &
 # exec-once = eww daemon && eww open bar
diff --git a/configs/hyprland/hypr/hyprland.conf b/configs/hyprland/hypr/hyprland.conf
index 2e0d46d..a0c166d 100644
--- a/configs/hyprland/hypr/hyprland.conf
+++ b/configs/hyprland/hypr/hyprland.conf
@@ -33,7 +33,7 @@ $nekoray = $SCRIPT_PATH/nekoray-launch.sh
 $network_manager = $SCRIPT_PATH/nmtui-launch.sh
 $random_wallpaper = $SCRIPT_PATH/wallpaper/wallpaper-daemon.sh
 $kill_wallpaper_daemon = $SCRIPT_PATH/wallpaper/kill-daemon.sh
-$waybar_toggle = $SCRIPT_PATH/waybar-toggle.sh
+$waybar_toggle = $SCRIPT_PATH/waybar/toggle.sh
 $rofi_menu = $SCRIPT_PATH/rofi-launch.sh d
 $rofi_powermenu = $SCRIPT_PATH/rofi-launch.sh p
 $rofi_screenshot = $SCRIPT_PATH/rofi-launch.sh s
diff --git a/configs/hyprland/hypr/scripts/startup/waybar.sh b/configs/hyprland/hypr/scripts/startup/waybar.sh
deleted file mode 100755
index 7e0a6a5..0000000
--- a/configs/hyprland/hypr/scripts/startup/waybar.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-source ~/.config/scripts/env.sh
-
-exec $WATCHER -a "$WAYBAR_LAUNCHER" -d "$WAYBAR_DIR" -p "waybar"
diff --git a/configs/hyprland/hypr/scripts/waybar-toggle.sh b/configs/hyprland/hypr/scripts/waybar-toggle.sh
deleted file mode 100755
index 6608b44..0000000
--- a/configs/hyprland/hypr/scripts/waybar-toggle.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-source ~/.config/scripts/env.sh
-
-WAYBAR_PID=$(pgrep -x waybar)
-
-if [ -n "$WAYBAR_PID" ]; then
-    pkill waybar
-elif [ $WAYBAR_DEV_MODE = true ]; then
-    GTK_DEBUG=interactive exec $WATCHER -a "$WAYBAR_LAUNCHER" -d "$WAYBAR_DIR" -p "waybar"
-else
-    exec $WATCHER -a "$WAYBAR_LAUNCHER" -d "$WAYBAR_DIR" -p "waybar"
-fi
diff --git a/configs/hyprland/hypr/scripts/waybar/start.sh b/configs/hyprland/hypr/scripts/waybar/start.sh
new file mode 100755
index 0000000..68e87b9
--- /dev/null
+++ b/configs/hyprland/hypr/scripts/waybar/start.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source ~/.config/scripts/env.sh
+
+exec $WATCHER -a "$WAYBAR_LAUNCHER" -d "$WAYBAR_WATCH_DIR" -p "waybar"
diff --git a/configs/hyprland/hypr/scripts/waybar/toggle.sh b/configs/hyprland/hypr/scripts/waybar/toggle.sh
new file mode 100755
index 0000000..7779f20
--- /dev/null
+++ b/configs/hyprland/hypr/scripts/waybar/toggle.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+source ~/.config/scripts/env.sh
+WAYBAR_START="$HOME/.config/hypr/scripts/waybar/start.sh"
+
+if pgrep -x waybar >/dev/null; then
+    pkill -f waybar
+fi
+
+if [ $WAYBAR_DEV_MODE = true ]; then
+    GTK_DEBUG=interactive $WAYBAR_START
+else
+    exec $WAYBAR_START
+fi
diff --git a/configs/hyprland/scripts/env.sh b/configs/hyprland/scripts/env.sh
index c576ff4..56a3a0a 100755
--- a/configs/hyprland/scripts/env.sh
+++ b/configs/hyprland/scripts/env.sh
@@ -6,7 +6,8 @@ export WATCHER="$HOME/.config/scripts/utils/watcher/main.sh"
 # waybar env :
 export WAYBAR_DEV_MODE=false
 export WAYBAR_THEME="river"
-export WAYBAR_DIR="$HOME/.config/waybar"
+export WAYBAR_DIR="$HOME/.config/waybar/$WAYBAR_THEME"
+export WAYBAR_WATCH_DIR="$HOME/.config/waybar"
 export WAYBAR_LAUNCHER="waybar -c $WAYBAR_DIR/config.jsonc -s $WAYBAR_DIR/style.css"
 
 # wallpaper configs - swaybg, swww, mpvpaper :