diff --git a/configs/hyprland/hypr/conf/keybinding.conf b/configs/hyprland/hypr/conf/keybinding.conf
index 423578c..8b01357 100644
--- a/configs/hyprland/hypr/conf/keybinding.conf
+++ b/configs/hyprland/hypr/conf/keybinding.conf
@@ -38,14 +38,14 @@ bind = $mainMod, Y, exec, $random_wallpaper
 bind = $mainMod, I, exec, $kill_wallpaper_daemon
 
 # Audio control
-binde=,XF86AudioRaiseVolume,exec, $volume_control u
-binde=,XF86AudioLowerVolume,exec, $volume_control d
-bind=,XF86AudioMute,exec, $volume_control m
-bind=,XF86AudioPlay,exec,playerctl play-pause
-bind=,XF86AudioPrev,exec,playerctl previous
-bind=,XF86AudioNext,exec,playerctl next
-bindl=,XF86AudioMedia,exec,playerctl play-pause
-bindl=,XF86AudioStop,exec,playerctl stop
+binde=,XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
+binde=,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
+bind=,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
+bind=,XF86AudioPlay, exec, playerctl play-pause
+bind=,XF86AudioPrev, exec, playerctl previous
+bind=,XF86AudioNext, exec, playerctl next
+bindl=,XF86AudioMedia, exec, playerctl play-pause
+bindl=,XF86AudioStop, exec, playerctl stop
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
diff --git a/configs/hyprland/hypr/hyprland.conf b/configs/hyprland/hypr/hyprland.conf
index 937aa2f..5ca4bc5 100644
--- a/configs/hyprland/hypr/hyprland.conf
+++ b/configs/hyprland/hypr/hyprland.conf
@@ -23,7 +23,6 @@ $network_manager = $scr_path/wpa-launch.sh
 $random_wallpaper = $scr_path/wallpaper-daemon.sh
 $kill_wallpaper_daemon = $scr_path/kill-wallpaper-daemon.sh
 $waybar_toggle = $scr_path/waybar-toggle.sh
-$volume_control = $scr_path/volume-control.sh
 $rofi_menu = $scr_path/rofi-launch.sh d
 $rofi_powermenu = $scr_path/rofi-launch.sh p
 $rofi_screenshot = $scr_path/rofi-launch.sh s
diff --git a/configs/hyprland/hypr/scripts/volume-control.sh b/configs/hyprland/hypr/scripts/volume-control.sh
deleted file mode 100755
index 2865ab2..0000000
--- a/configs/hyprland/hypr/scripts/volume-control.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-MAX_VOLUME=150
-DUNST_TIMEOUT=1500
-
-get_current_volume() {
-    pactl list sinks | grep '^[[:space:]]Volume:' | head -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,'
-}
-
-adjust_volume() {
-    local volume=$1
-    if [ "$volume" -gt "$MAX_VOLUME" ]; then
-        echo "$MAX_VOLUME"
-    elif [ "$volume" -lt 0 ]; then
-        echo "0"
-    else
-        echo "$volume"
-    fi
-}
-
-show_progress_notification() {
-    dunstify -a "Volume Control" -u low -t "$DUNST_TIMEOUT" -r 2593 -i audio-volume-medium -h string:x-dunst-stack-tag:volume "Volume: $1%" "$2"
-}
-
-calculate_progress() {
-    local percentage=$1
-    local total=20 # Number of progress bar characters
-    local progress=$((percentage * total / 100))
-    printf -v progress_bar "%-${progress}s" " "
-    printf -v remaining_bar "%-$((total - progress))s" " "
-    echo "$progress_bar$remaining_bar"
-}
-
-case $1 in
-t)
-    pactl set-source-mute @DEFAULT_SOURCE@ toggle
-    ;;
-u)
-    current_volume=$(get_current_volume)
-    new_volume=$((current_volume + 5))
-    adjusted_volume=$(adjust_volume "$new_volume")
-    pactl set-sink-volume @DEFAULT_SINK@ "$adjusted_volume%"
-    show_progress_notification "$adjusted_volume" "$(calculate_progress "$adjusted_volume")"
-    ;;
-d)
-    current_volume=$(get_current_volume)
-    new_volume=$((current_volume - 5))
-    adjusted_volume=$(adjust_volume "$new_volume")
-    pactl set-sink-volume @DEFAULT_SINK@ "$adjusted_volume%"
-    show_progress_notification "$adjusted_volume" "$(calculate_progress "$adjusted_volume")"
-    ;;
-m)
-    pactl set-sink-mute @DEFAULT_SINK@ toggle
-    if pactl list sinks | grep -q "Mute: yes"; then
-        show_progress_notification "0" "$(calculate_progress "0")"
-    else
-        current_volume=$(get_current_volume)
-        adjusted_volume=$(adjust_volume "$current_volume")
-        pactl set-sink-volume @DEFAULT_SINK@ "$adjusted_volume%"
-        show_progress_notification "$adjusted_volume" "$(calculate_progress "$adjusted_volume")"
-    fi
-    ;;
-h)
-    echo "u :  volume up"
-    echo "d :  volume down"
-    echo "m :  mute volume"
-    exit 0
-    ;;
-*) ;;
-esac
diff --git a/configs/hyprland/waybar/river/config.jsonc b/configs/hyprland/waybar/river/config.jsonc
index 7530fce..837da36 100644
--- a/configs/hyprland/waybar/river/config.jsonc
+++ b/configs/hyprland/waybar/river/config.jsonc
@@ -39,10 +39,12 @@
     "tooltip": false
   },
   "pulseaudio#output": {
-    "format": "{icon}  {volume}%",
+    "format": "{volume}%  {icon}",
+    "format-bluetooth": "{volume}%  ",
     "format-muted": "  0%",
     "format-source": "",
     "format-icons": {
+      "headset": "",
       "default": [
         "",
         "",
@@ -54,8 +56,8 @@
     "on-click": "pavucontrol"
   },
   "pulseaudio#input": {
-    "format-source": "  {volume}%",
-    "format-source-muted": "  0%",
+    "format-source": "{volume}%  ",
+    "format-source-muted": "0%  ",
     "format": "{format_source}",
     "on-click": "pactl set-source-mute @DEFAULT_SOURCE@ toggle",
     "on-scroll-up": "pactl set-source-volume @DEFAULT_SOURCE@ +5%",