diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 89b0aee..a5f06aa 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -17,8 +17,8 @@ bspc monitor HDMI-0 -n D
 pgrep -x sxhkd > /dev/null || sxhkd &
 pgrep -x picom > /dev/null || picom &
 
-/home/david/.config/polybar/launch.sh
-/home/david/.scripts/bg.sh
+$HOME/.config/polybar/launch.sh
+$HOME/.scripts/bg.sh
 
 bspc monitor A -d a1 a2 a3 a4 a5 a6 a7
 bspc monitor B -d b1 b2 b3 b4 b5
diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf
index 69178be..cf7346b 100644
--- a/config/mpd/mpd.conf
+++ b/config/mpd/mpd.conf
@@ -1,440 +1,39 @@
-# An example configuration file for MPD.
-# Read the user manual for documentation: http://www.musicpd.org/doc/user/
 
-
-# Files and directories #######################################################
-#
-# This setting controls the top directory which MPD will search to discover the
-# available audio files and add them to the daemon's online database. This
-# setting defaults to the XDG directory, otherwise the music directory will be
-# be disabled and audio files will only be accepted over ipc socket (using
-# file:// protocol) or streaming files over an accepted protocol.
-#
-#music_directory		"~/music"
-#
-# This setting sets the MPD internal playlist directory. The purpose of this
-# directory is storage for playlists created by MPD. The server will use
-# playlist files not created by the server but only if they are in the MPD
-# format. This setting defaults to playlist saving being disabled.
-#
-#playlist_directory		"~/.config/mpd/playlists"
-#
-# This setting sets the location of the MPD database. This file is used to
-# load the database at server start up and store the database while the
-# server is not up. This setting defaults to disabled which will allow
-# MPD to accept files over ipc socket (using file:// protocol) or streaming
-# files over an accepted protocol.
-#
-#db_file			"~/.mpd/database"
-#
-# These settings are the locations for the daemon log files for the daemon.
-# These logs are great for troubleshooting, depending on your log_level
-# settings.
-#
-# The special value "syslog" makes MPD use the local syslog daemon. This
-# setting defaults to logging to syslog.
-#
-#log_file			"~/.mpd/log"
-#
-# This setting sets the location of the file which stores the process ID
-# for use of mpd --kill and some init scripts. This setting is disabled by
-# default and the pid file will not be stored.
-#
-#pid_file			"~/.mpd/pid"
-#
-# This setting sets the location of the file which contains information about
-# most variables to get MPD back into the same general shape it was in before
-# it was brought down. This setting is disabled by default and the server
-# state will be reset on server start up.
-#
-#state_file			"~/.mpd/state"
-#
-# The location of the sticker database.  This is a database which
-# manages dynamic information attached to songs.
-#
-#sticker_file			"~/.mpd/sticker.sql"
-#
-###############################################################################
-
-
-# General music daemon options ################################################
-#
-# This setting specifies the user that MPD will run as. MPD should never run as
-# root and you may use this setting to make MPD change its user ID after
-# initialization. This setting is disabled by default and MPD is run as the
-# current user.
-#
-#user				"nobody"
-#
-# This setting specifies the group that MPD will run as. If not specified
-# primary group of user specified with "user" setting will be used (if set).
-# This is useful if MPD needs to be a member of group such as "audio" to
-# have permission to use sound card.
-#
-#group				"nogroup"
-#
-# This setting sets the address for the daemon to listen on. Careful attention
-# should be paid if this is assigned to anything other than the default, any.
-# This setting can deny access to control of the daemon. Not effective if
-# systemd socket activiation is in use.
-#
-# For network
-#bind_to_address		"0.0.0.0"
-#
-# And for Unix Socket
-#bind_to_address		"~/.mpd/socket"
-#
-# This setting is the TCP port that is desired for the daemon to get assigned
-# to.
-#
-#port				"6600"
-#
-# Suppress all messages below the given threshold.  Use "verbose" for
-# troubleshooting. Available setting arguments are "notice", "info", "verbose",
-# "warning" and "error".
-#
-#log_level			"notice"
-#
-# Setting "restore_paused" to "yes" puts MPD into pause mode instead
-# of starting playback after startup.
-#
-#restore_paused "no"
-#
-# This setting enables MPD to create playlists in a format usable by other
-# music players.
-#
-#save_absolute_paths_in_playlists	"no"
-#
-# This setting defines a list of tag types that will be extracted during the
-# audio file discovery process. The complete list of possible values can be
-# found in the user manual.
-#metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
-#
-# This example just enables the "comment" tag without disabling all
-# the other supported tags:
-#metadata_to_use "+comment"
-#
-# This setting enables automatic update of MPD's database when files in
-# music_directory are changed.
-#
-auto_update	"yes"
-#
-# Limit the depth of the directories being watched, 0 means only watch
-# the music directory itself.  There is no limit by default.
-#
-#auto_update_depth "3"
-#
-###############################################################################
-
-
-# Symbolic link behavior ######################################################
-#
-# If this setting is set to "yes", MPD will discover audio files by following
-# symbolic links outside of the configured music_directory.
-#
-#follow_outside_symlinks	"yes"
-#
-# If this setting is set to "yes", MPD will discover audio files by following
-# symbolic links inside of the configured music_directory.
-#
-#follow_inside_symlinks		"yes"
-#
-###############################################################################
-
-
-# Zeroconf / Avahi Service Discovery ##########################################
-#
-# If this setting is set to "yes", service information will be published with
-# Zeroconf / Avahi.
-#
-#zeroconf_enabled		"yes"
-#
-# The argument to this setting will be the Zeroconf / Avahi unique name for
-# this MPD server on the network. %h will be replaced with the hostname.
-#
-#zeroconf_name			"Music Player @ %h"
-#
-###############################################################################
-
-
-# Permissions #################################################################
-#
-# If this setting is set, MPD will require password authorization. The password
-# setting can be specified multiple times for different password profiles.
-#
-#password                        "mpDsifrA@read,add,control,admi"
-#
-# This setting specifies the permissions a user has who has not yet logged in.
-#
-#Default_permissions             "read"
-#
-###############################################################################
-
-
-# Database #######################################################################
-#
-# An example of a database section instead of the old 'db_file' setting.
-# It enables mounting other storages into the music directory.
-#
-#database {
-#       plugin "simple"
-#       path "~/.local/share/mpd/db#
-#       cache_directory "~/.local/share/mpd/cache"
-#}
-#
-# An example of database config for a sattelite setup
-#
-#music_directory "nfs://fileserver.local/srv/mp3"
-#database {
-#       plugin "proxy"
-#       host "other.mpd.host"
-#       port "6600"
-#}
-
-# Input #######################################################################
-#
 input {
         plugin "curl"
-#       proxy "proxy.isp.com:8080"
-#       proxy_user "user"
-	#       proxy_password "password"
-	}
+}
 
-	#
-	###############################################################################
-
-	# Audio Output ################################################################
-	#
-	# MPD supports various audio output types, as well as playing through multiple
-	# audio outputs at the same time, through multiple audio_output settings
-	# blocks. Setting this block is optional, though the server will only attempt
-	# autodetection for one sound card.
-	#
-	# An example of an ALSA output:
-	#
-	#audio_output {
-	#	type		"alsa"
-	#	name		"My ALSA Device"
-	##	device		"hw:0,0"	# optional
-	##	mixer_type      "hardware"	# optional
-	##	mixer_device	"default"	# optional
-	##	mixer_control	"PCM"		# optional
-	##	mixer_index	"0"		# optional
-	#}
-	#
-	# An example of an OSS output:
-	#
-	#audio_output {
-	#	type		"oss"
-	#	name		"My OSS Device"
-	##	device		"/dev/dsp"	# optional
-	##	mixer_type      "hardware"	# optional
-	##	mixer_device	"/dev/mixer"	# optional
-	##	mixer_control	"PCM"		# optional
-	#}
-	#
-	# An example of a shout output (for streaming to Icecast):
-	#
-	#audio_output {
-	#	type		"shout"
-	#	encoder		"vorbis"		# optional
-	#	name		"My Shout Stream"
-	#	host		"localhost"
-	#	port		"8000"
-	#	mount		"/mpd.ogg"
-	#	password	"hackme"
-#	quality		"5.0"
-#	bitrate		"128"
-#	format		"44100:16:1"
-##	protocol	"icecast2"		# optional
-##	user		"source"		# optional
-##	description	"My Stream Description"	# optional
-##	url		"http://example.com"	# optional
-##	genre		"jazz"			# optional
-##	public		"no"			# optional
-##	timeout		"2"			# optional
-##	mixer_type      "software"		# optional
-#}
-#
-# An example of a recorder output:
-#
-#audio_output {
-#	type		"recorder"
-#	name		"My recorder"
-#	encoder		"vorbis"		# optional, vorbis or lame
-#	path		"/var/lib/mpd/recorder/mpd.ogg"
-##	quality		"5.0"			# do not define if bitrate is defined
-#	bitrate		"128"			# do not define if quality is defined
-#	format		"44100:16:1"
-#}
-#
-# An example of a httpd output (built-in HTTP streaming server):
-#
 audio_output {
 	type		"httpd"
 	name		"My HTTP Stream"
-	encoder		"flac"		# optional, vorbis or lame
-	#encoder		"lame"		# optional, vorbis or lame
-	port		"6680"
-	#bind_to_address	"0.0.0.0"		# optional, IPv4 or IPv6
-#	quality		"5.0"			# do not define if bitrate is defined
-	bitrate		"440"			# do not define if quality is defined
+	encoder		"lame"		    # optional, vorbis or lame
+	port		"6680"      
+	bitrate		"420"	
 	format		"44100:16:1"
-	max_clients	"0"			# optional 0=no limit
+	max_clients	"0"	
 }
-#
-# An example of a pulseaudio output (streaming to a remote pulseaudio server)
-#
+
 audio_output {
 	type		"pulse"
 	name		"mpd"
-#	server		"remote_server"		# optional
-#	sink		"remote_server_sink"	# optional
-#	media_role	"media_role"		#optional
 }
+
 audio_output {
        type            "fifo"
        name            "Visualizer feed"          
        path            "/tmp/mpd.fifo"           
        format          "44100:16:2"               
-}                                                 #audio_output {
-                                                  #	type		"winmm"
-##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
-#		or
-##	device		"0"		# optional
-##	mixer_type	"hardware"	# optional
-#}
-#
-# An example of a wasapi output (Windows multimedia API).
-#
-#audio_output {
-#	type		"wasapi"
-#	name		"My WASAPI output"
-##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
-#		or
-##	device		"0"		# optional
-## Exclusive mode blocks all other audio source, and get best audio quality without resampling.
-##	exclusive	"no"		# optional
-## Enumerate all devices in log.
-##	enumerate	"no"		# optional
-#}
-#
-# An example of an openal output.
-#
-#audio_output {
-#	type		"openal"
-#	name		"My OpenAL output"
-##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
-#}
-#
-# An example of an sndio output.
-#
-#audio_output {
-#	type		"sndio"
-#	name		"sndio output"
-#	mixer_type	"hardware"
-#}
-#
-# An example of an OS X output:
-#
-#audio_output {
-#	type		"osx"
-#	name		"My OS X Device"
-##	device		"Built-in Output"	# optional
-##	channel_map      "-1,-1,0,1"	# optional
-#}
-#
-## Example "pipe" output:
-#
-#audio_output {
-#	type		"pipe"
-#	name		"my pipe"
-#	command		"aplay -f cd 2>/dev/null"
-## Or if you're want to use AudioCompress
-#	command		"AudioCompress -m | aplay -f cd 2>/dev/null"
-## Or to send raw PCM stream through PCM:
-#	command		"nc example.org 8765"
-#	format		"44100:16:2"
-#}
-#
-## An example of a null output (for no audio output):
-#
-#audio_output {
-#	type		"null"
-#	name		"My Null Output"
-#	mixer_type      "none"			# optional
-#}
-#
-###############################################################################
+}                 
 
-
-# Normalization automatic volume adjustments ##################################
-#
-# This setting specifies the type of ReplayGain to use. This setting can have
-# the argument "off", "album", "track" or "auto". "auto" is a special mode that
-# chooses between "track" and "album" depending on the current state of
-# random playback. If random playback is enabled then "track" mode is used.
-# See <https://wiki.hydrogenaud.io/index.php?title=Replaygain> for
-# more details about ReplayGain.
-# This setting is off by default.
-#
-#replaygain			"album"
-#
-# This setting sets the pre-amp used for files that have ReplayGain tags. By
-# default this setting is disabled.
-#
-#replaygain_preamp		"0"
-#
-# This setting sets the pre-amp used for files that do NOT have ReplayGain tags.
-# By default this setting is disabled.
-#
-#replaygain_missing_preamp	"0"
-#
-# This setting enables or disables ReplayGain limiting.
-# MPD calculates actual amplification based on the ReplayGain tags
-# and replaygain_preamp / replaygain_missing_preamp setting.
-# If replaygain_limit is enabled MPD will never amplify audio signal
-# above its #original level. If replaygain_limit is disabled such amplification
-# might occur. By default this setting is enabled.
-#
-#replaygain_limit		"yes"
-#
-# This setting enables on-the-fly normalization volume adjustment. This will
-# result in the volume of all playing audio to be adjusted so the output has
-# equal "loudness". This setting is disabled by default.
-#
-#volume_normalization		"no"
-#
-###############################################################################
-
-# Character Encoding ##########################################################
-#
-# If file or directory names do not display correctly for your locale then you
-# may need to modify this setting.
-#
-#filesystem_charset		"UTF-8"
-#
-###############################################################################
-
-
-# Recommended location for database
 db_file            "~/.config/mpd/database"
-
-# Logs to systemd journal
 log_file           "syslog"
 
-# The music directory is by default the XDG directory, uncomment to amend and choose a different directory
 music_directory    "~/music"
 
-# Uncomment to refresh the database whenever files in the music_directory are changed
-#auto_update "yes"
-
-# Uncomment to enable the functionalities
 playlist_directory "~/.config/mpd/playlists"
 pid_file           "~/.config/mpd/pid"
 state_file         "~/.config/mpd/state"
 sticker_file       "~/.config/mpd/sticker.sql"
 
 restore_paused "yes"
-
-
+auto_update	"yes"
diff --git a/config/mpd/password b/config/mpd/password
deleted file mode 100644
index 712380a..0000000
--- a/config/mpd/password
+++ /dev/null
@@ -1 +0,0 @@
-mpDsifrA
diff --git a/config/mpd/pid b/config/mpd/pid
index 69df048..c3a7dd3 100644
--- a/config/mpd/pid
+++ b/config/mpd/pid
@@ -1 +1 @@
-435234
+2110694
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 8ffb0a5..7358236 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -10,10 +10,12 @@ super + ctrl + alt + f
 	pactl list sources | grep -qi 'Active Port: analog-input-rear-mic' && pactl set-source-port 2 analog-input-front-mic || pactl set-source-port 2 analog-input-rear-mic
 
 #Volume Control
-super + Next
+{XF86AudioLowerVolume,super + Next}
 	amixer -D pulse sset Master 5%-
-super + Prior
+{XF86AudioRaiseVolume,super + Prior}
 	amixer -D pulse sset Master 5%+
+{XF86AudioMute}
+	amixer -D pulse set Master 1+ toggle
 
 # runner
 super + r
@@ -161,10 +163,10 @@ super + comma
 super + alt + ctrl + o
 	mpc toggle
 
-super + alt + ctrl + p
+{XF86AudioNext, super + alt + ctrl + p
 	mpc next 
 
-super + alt + ctrl + i 
+{XF86AudioPrev,super + alt + ctrl + i}
 	mpc prev
 super + alt + ctrl + apostrophe
 	mpc shuffle
diff --git a/deploy.sh b/deploy.sh
index 255a60c..8edf503 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -26,6 +26,7 @@ save () {
 
 
     rm config/mpd/state
+    rm config/mpd/password
     rm config/vim/viminfo
 
 }
@@ -59,7 +60,7 @@ load () {
 
 install () {
     PKG="yay -S "
-    $PKG xorg xorg-xinit pulseaudio pulsemixer alsa-utils pulseaudio-alsa xdg-user-dirs fzf bspwm cava neofetch mpd mpv ncmpcpp vim sxhkd polybar picom rofi rxvt-unicode zathura zathura-pdf-mupdf pcmanfm
+    $PKG xorg xorg-xinit pulseaudio pulsemixer alsa-utils pulseaudio-alsa xdg-user-dirs fzf bspwm cava neofetch mpd mpv libvdpau-va-gl ncmpcpp vim sxhkd polybar picom rofi rxvt-unicode zathura zathura-pdf-mupdf pcmanfm maim
 
     ln -s /usr/bin/rofi /usr/bin/dmenu
 
diff --git a/scripts/screenshot b/scripts/screenshot
index 3aa7f47..626671c 100755
--- a/scripts/screenshot
+++ b/scripts/screenshot
@@ -1,4 +1,2 @@
 #!/bin/bash
-#sleep 0.2
-#scrot -s '/home/david/pics/screenshot/%F_%T_$wx$h.png' -e 'xclip -selection clipboard -target image/png -i $f'
-maim -su /dev/stdout |  tee >(xclip -selection clipboard -t image/png) > $(date +"/home/david/pics/screenshot/%F_%T.png")
+maim -su /dev/stdout |  tee >(xclip -selection clipboard -t image/png) > $(date +"$HOME/pics/screenshot/%F_%T.png")
diff --git a/scripts/screenshot_floating b/scripts/screenshot_floating
index 29e8303..dec0d1e 100755
--- a/scripts/screenshot_floating
+++ b/scripts/screenshot_floating
@@ -1,5 +1,5 @@
  #!/bin/sh
-filename=$(date +"/home/david/pics/screenshot/%F_%T.png")
+filename=$(date +"$HOME/pics/screenshot/%F_%T.png")
 maim -su $filename && bspc rule -a \* -o state=floating && feh -Z $filename
 
 
diff --git a/scripts/screenshot_fs b/scripts/screenshot_fs
index 827eb9f..c8a9aa2 100755
--- a/scripts/screenshot_fs
+++ b/scripts/screenshot_fs
@@ -1,4 +1,2 @@
 #!/bin/bash
-#sleep 0.2
-#scrot -s '/home/david/pics/screenshot/%F_%T_$wx$h.png' -e 'xclip -selection clipboard -target image/png -i $f'
-maim -u /dev/stdout |  tee >(xclip -selection clipboard -t image/png) > $(date +"/home/david/pics/screenshot/%F_%T.png")
+maim -u /dev/stdout |  tee >(xclip -selection clipboard -t image/png) > $(date +"$HOME/pics/screenshot/%F_%T.png")