diff --git a/scripts/rofi-mpd-desktop b/scripts/rofi-mpd-desktop
index ddf03e9..f4d0425 100755
--- a/scripts/rofi-mpd-desktop
+++ b/scripts/rofi-mpd-desktop
@@ -4,40 +4,40 @@ m() { rofi -theme -dmenu -config ~/SudacodeRice/rofi/dracula.rasi -l 24 -i "$@";
 mb() { rofi -dmenu -config ~/SudacodeRice/rofi/dracula.rasi -l 24 -i -kb-custom-1 "Alt+q" "$@"; }
 
 artist() {
-  lines="$(mpc list artist | wc -l)"
-  [ "$lines" -gt 30 ] && lines=30
-  mpc list artist | sort -f | m -p "Artists" -l $lines
+	lines="$(mpc list artist | wc -l)"
+	[ "$lines" -gt 30 ] && lines=30
+	mpc list artist | sort -f | m -p "Artists" -l $lines
 }
 
 a_album() {
-  artist="$1"
-  lines="$(mpc list album artist "$artist" | wc -l)"
-  [ "$lines" -gt 30 ] && lines=30
-  mpc list album artist "$artist" | sort -f | mb -p "Albums" -l $lines
+	artist="$1"
+	lines="$(mpc list album artist "$artist" | wc -l)"
+	[ "$lines" -gt 30 ] && lines=30
+	mpc list album artist "$artist" | sort -f | mb -p "Albums" -l $lines
 }
 
 album() {
-  lines="$(mpc list album | wc -l)"
-  [ "$lines" -gt 30 ] && lines=30
-  mpc list album | sort -f | mb -p "Album" -l $lines
+	lines="$(mpc list album | wc -l)"
+	[ "$lines" -gt 30 ] && lines=30
+	mpc list album | sort -f | mb -p "Album" -l $lines
 }
 
 song() {
-  lines="$(mpc list title | wc -l)"
-  [ "$lines" -gt 30 ] && lines=30
-  mpc list title | sort -f | mb -p "Song" -l 30
+	lines="$(mpc list title | wc -l)"
+	[ "$lines" -gt 30 ] && lines=30
+	mpc list title | sort -f | mb -p "Song" -l 30
 }
 
 case "$1" in
--l | --library) mode=Library ;;
--A | --album) mode=Album ;;
--s | --song) mode=Song ;;
--a | --ask)
-  MODE=$(printf "Library\nAlbum\nSong" | m -p "Choose mode" -l 3)
-  mode=$MODE
-  ;;
--h | --help)
-  echo "
+	-l | --library) mode=Library ;;
+	-A | --album) mode=Album ;;
+	-s | --song) mode=Song ;;
+	-a | --ask)
+		MODE=$(printf "Library\nAlbum\nSong" | m -p "Choose mode" -l 3)
+		mode=$MODE
+		;;
+	-h | --help)
+		echo "
   usage: rofi-mpd [-h] [-l] [-s] [-a]
 
   arguments:
@@ -51,35 +51,35 @@ case "$1" in
   enter             play song/album now
   Alt+q             add song/album to queue
     "
-  exit
-  ;;
+		exit
+		;;
 esac
 
 case "$mode" in
-Library)
-  artist=$(artist)
-  [ ! "$artist" ] && exit
-  album=$(a_album "$artist")
-  cod=$?
-  [ ! "$album" ] && exit
-  [ "$cod" -eq 10 ] || mpc clear
-  mpc find artist "$artist" album "$album" | mpc add
-  mpc play >/dev/null
-  ;;
-Song)
-  song=$(song)
-  cod=$?
-  [ ! "$song" ] && exit
-  [ "$cod" -eq 10 ] || mpc clear
-  mpc search "(title==\"$song\")" | mpc add
-  mpc play >/dev/null
-  ;;
-Album)
-  album=$(album)
-  cod=$?
-  [ ! "$album" ] && exit
-  [ "$cod" -eq 10 ] || mpc clear
-  mpc find album "$album" | mpc add
-  mpc play >/dev/null
-  ;;
+	Library)
+		artist=$(artist)
+		[ ! "$artist" ] && exit
+		album=$(a_album "$artist")
+		cod=$?
+		[ ! "$album" ] && exit
+		[ "$cod" -eq 10 ] || mpc clear
+		mpc find artist "$artist" album "$album" | mpc add
+		mpc play > /dev/null
+		;;
+	Song)
+		song=$(song)
+		cod=$?
+		[ ! "$song" ] && exit
+		[ "$cod" -eq 10 ] || mpc clear
+		mpc search "(title==\"$song\")" | mpc add
+		mpc play > /dev/null
+		;;
+	Album)
+		album=$(album)
+		cod=$?
+		[ ! "$album" ] && exit
+		[ "$cod" -eq 10 ] || mpc clear
+		mpc find album "$album" | mpc add
+		mpc play > /dev/null
+		;;
 esac
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index ed4e5c9..a324d86 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -147,31 +147,25 @@ super + {Left,Down,Up,Right}
 # Special hotkeys
 #
 
-# Multimedia keys
+# Volume Control
 XF86AudioRaiseVolume
   amixer -q set Master 5%+ unmute && ~/SudacodeRice/scripts/dunst_volume/dunst_volume.py increase
-
 XF86AudioLowerVolume
   amixer -q set Master 5%- unmute && ~/SudacodeRice/scripts/dunst_volume/dunst_volume.py decrease
-
 XF86AudioMute
   amixer -D pulse sset Master toggle-mute && ~/SudacodeRice/scripts/dunst_volume/dunst_volume.py mute
 
-# XF86AudioRaiseVolume @DEFAULT_SINK@ +10%; ~/SudacodeRice/scripts/dunst_volume/dunst_volume.py increase
+# Next/Toggle/Prev Song
+XF86AudioPrev
+  ~/SudacodeRice/scripts/music-controls.sh -p
+XF86AudioPlay
+  ~/SudacodeRice/scripts/music-controls.sh -t
+XF86AudioNext
+  ~/SudacodeRice/scripts/music-controls.sh -n
 
-# XF86AudioLowerVolume pactl set-sink-volume @DEFAULT_SINK@ -10%; ~/SudacodeRice/scripts/dunst_volume/dunst_volume.py decrease
-
-# XF86AudioMute @DEFAULT_SINK@ toggle; ~/SudacodeRice/scripts/dunst_volume/dunst_volume.py mute
-
-
-# amixer -q set Master toggle
-# Simple amixer command seems to have problems unmuting device
-
-# Brightness up
+# Brightness
 XF86MonBrightnessUp
   xbacklight -inc 5
-
-# And brightness down
 XF86MonBrightnessDown
   xbacklight -dec 5
 
@@ -183,29 +177,29 @@ alt+Print
   ~/.config/bspwm/scripts/screenshot.sh
 
 # Shortcuts
-super + w
-  firefox
-
-super + t
+alt + p
+  pavucontrol
+alt + t
   thunar
-
-super + F1
+alt + F1
   ~/.config/bspwm/scripts/keybindings_rofi.sh
-
-# ncmpcpp
 alt + n
   alacritty -e ncmpcpp
-
-# bpytop
 alt + b
   alacritty -e bpytop
 
+# Rofi
 alt + shift + p
   ~/.config/rofi/scripts/rofi-picom.sh
 alt + shift + n
   ~/.config/rofi/scripts/rofi-networks.sh
+alt + shift + m
+  ~/SudacodeRice/scripts/rofi-mpd-desktop -s
+alt + shift + g
+  ~/SudacodeRice/scripts/rofi/rofi-search.sh
+alt + shift + y
+  ~/.bin/rofi-stream
 
-# Rofi
 control + shift + s
   ~/Work/rofi/rofi-ssh.sh "$HOME/SudacodeRice/rofi/flat-orange.rasi"
 control + shift + r