diff --git a/waybar/mediaplayer.py b/waybar/mediaplayer.py
index 75122a8..9c6d4f6 100755
--- a/waybar/mediaplayer.py
+++ b/waybar/mediaplayer.py
@@ -127,7 +127,10 @@ class PlayerManager:
         player_name = player.props.player_name
         artist = player.get_artist()
         title = player.get_title()
-        title = title.replace("&", "&")
+        if title is not None:
+            title = title.replace("&", "&")
+        else:
+            title = "No title"
 
         track_info = ""
         if (
diff --git a/waybar/firefox-status.sh b/waybar/playerctl.sh
similarity index 51%
rename from waybar/firefox-status.sh
rename to waybar/playerctl.sh
index 4d3defa..342e592 100755
--- a/waybar/firefox-status.sh
+++ b/waybar/playerctl.sh
@@ -1,6 +1,13 @@
 #!/bin/sh
 
-STATUS="$(playerctl -p firefox status)"
+PLAYER="$1"
+
+if [ -z "$PLAYER" ]; then
+	echo "Usage: $0 <player>"
+	exit 1
+fi
+
+STATUS="$(playerctl -p "$PLAYER" status)"
 
 if [ -z "$STATUS" ] || [ "$STATUS" = "Stopped" ]; then
 	exit 0
@@ -12,7 +19,7 @@ else
 	exit 0
 fi
 
-TITLE="$(playerctl -p firefox metadata title)"
-ARTIST="$(playerctl -p firefox metadata artist)"
+TITLE="$(playerctl -p "$PLAYER" metadata title)"
+ARTIST="$(playerctl -p "$PLAYER" metadata artist)"
 
 printf "%s\n" "$STATUS$TITLE - $ARTIST"
diff --git a/waybar/reload-waybar b/waybar/reload-waybar
index 2acd298..0e40af1 100755
--- a/waybar/reload-waybar
+++ b/waybar/reload-waybar
@@ -6,5 +6,14 @@ if pgrep -af "waybar -c /home/sudacode/.config/waybar/catppuccin-macchiato/confi
 fi
 
 BASE_DIR="$HOME/.config/waybar/catppuccin-macchiato"
+NODE_NAME="$(hyprctl systeminfo | grep -i "node name" | sed 's/Node name: //')"
 
-waybar -c "$BASE_DIR/config-battery.jsonc" -s "$BASE_DIR/style.css" &>/dev/null &
+if [[ "$NODE_NAME" = "sc-arch" ]]; then
+    CONFIG="$BASE_DIR/config.jsonc"
+else
+    CONFIG="$BASE_DIR/config-laptop.jsonc"
+fi
+
+
+
+waybar -c "$CONFIG" -s "$BASE_DIR/style.css" &>/dev/null &
diff --git a/waybar/scroll-firefox.sh b/waybar/scroll-firefox.sh
index 2f634e2..ff87d75 100755
--- a/waybar/scroll-firefox.sh
+++ b/waybar/scroll-firefox.sh
@@ -2,9 +2,10 @@
 
 zscroll -p ' | ' --delay 0.2 \
 	--length 30 \
-	--match-command "$HOME/.config/waybar/scripts/firefox-status.sh" \
+	--match-command "$HOME/.config/waybar/scripts/playerctl.sh firefox" \
 	--match-text ' ' "" \
 	--match-text ' ' "--scroll 0" \
+	--match-text "^volume:" "--before-text '' --scroll 0 --after-text ''" \
 	--update-interval 1 \
-	--update-check true "$HOME/.config/waybar/scripts/firefox-status.sh" &
+	--update-check true "$HOME/.config/waybar/scripts/playerctl.sh firefox" &
 wait
diff --git a/waybar/scroll-mpv.sh b/waybar/scroll-mpv.sh
new file mode 100755
index 0000000..6b946fc
--- /dev/null
+++ b/waybar/scroll-mpv.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+zscroll -p ' | ' --delay 0.2 \
+	--length 30 \
+	--match-command "$HOME/.config/waybar/scripts/playerctl.sh mpv" \
+	--match-text ' ' "" \
+	--match-text ' ' "--scroll 0" \
+	--match-text "^volume:" "--before-text '' --scroll 0 --after-text ''" \
+	--update-interval 1 \
+	--update-check true "$HOME/.config/waybar/scripts/playerctl.sh mpv" &
+wait