diff --git a/conf/home/Xresources b/conf/config/X11/Xresources
similarity index 100%
rename from conf/home/Xresources
rename to conf/config/X11/Xresources
diff --git a/conf/home/bashrc b/conf/home/bashrc
index d36c8d2..c1ead02 100644
--- a/conf/home/bashrc
+++ b/conf/home/bashrc
@@ -19,5 +19,6 @@ alias gp='git push'
 alias gco='git commit'
 alias rm='rm -i'
 alias mv='mv -i'
+alias ..='cd ..'
 
 PS1='\[\033[33m\][\u] \[\033[1;34m\]\W $ \[\033[0;00m\]'
diff --git a/conf/home/xinitrc b/conf/home/xinitrc
index 0430dfb..cfbc7e3 100644
--- a/conf/home/xinitrc
+++ b/conf/home/xinitrc
@@ -5,8 +5,6 @@
 STARTW_ROOT=${HOME}/.local/share/startw
 DOTS_ROOT=${STARTW_ROOT}/conf
 STARTX_LOG_FILE=${STARTW_ROOT}/"err-x11-$(date +%F).log"
-userresources=${HOME}/.Xresources
-usermodmap=${HOME}/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
@@ -20,20 +18,6 @@ if test -z "${XDG_RUNTIME_DIR}"; then
         fi
 fi
 
-#
-# XORG CONFIGURATION
-#
-
-# merge in defaults and keymaps
-if [ -f $sysresources ]; then xrdb -merge $sysresources; fi
-if [ -f $sysmodmap ]; then xmodmap $sysmodmap; fi
-if [ -f "$userresources" ]; then xrdb -merge "$userresources"; fi
-if [ -f "$usermodmap" ]; then xmodmap "$usermodmap"; fi
-
-xsetroot -cursor_name left_ptr &
-setxkbmap it
-xrandr --dpi 157
-
 #
 # USER CONFIGURATION
 #
@@ -73,6 +57,10 @@ done
 # SET ENVIRONMENT VARIABLES
 #
 
+# Disable less history
+export LESSHISTFILE="-"
+# Use gtk2 themes for Qt applications
+export QT_QPA_PLATFORMTHEME="gtk2"
 # Fix java applications for tiling WMs
 export _JAVA_AWT_WM_NONREPARENTING=1
 # Set the hardware acceleration driver
@@ -96,12 +84,40 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export ATOM_HOME="$XDG_DATA_HOME"/atom
 export BASH_COMPLETION_USER_FILE="$XDG_CONFIG_HOME"/bash-completion/bash_completion
 export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export WGETRC="$XDG_CONFIG_HOME"/wget/wgetrc
+export GOPATH="$XDG_DATA_HOME"/go
+export WINEPREFIX="$XDG_DATA_HOME"/wineprefixes/default
+export ABDUCO_SOCKET_DIR="$XDG_CACHE_HOME"/abduco
+export GRIPHOME="$XDG_CONFIG_HOME"/grip
+export INPUTRC="$XDG_CONFIG_HOME"/inputrc
+export HISTFILE="$XDG_DATA_HOME"/bash/history
+export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat
+export TERMINFO="$XDG_DATA_HOME"/terminfo
+export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo
+userresources="$XDG_CONFIG_HOME"/X11/Xresources
+usermodmap="$XDG_CONFIG_HOME"/X11/Xmodmap
+#export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
 # Set user script dir
 export SCRIPT_DIR="$XDG_CONFIG_HOME"/scripts
 # Wallpaer
-export WALLPAPER="$HOME/Pictures/walls/waves.jpg"
+export WALLPAPER="$HOME/Pictures/walls/waves.png"
 # Lock screen config
-export XSECURELOCK_SAVER=saver_xscreensaver
+export XSECURELOCK_SAVER=saver_mpv
+export XSECURELOCK_LIST_VIDEOS_COMMAND="echo ~/Videos/bounce.mkv"
+
+#
+# XORG CONFIGURATION
+#
+
+# merge in defaults and keymaps
+if [ -f $sysresources ]; then xrdb -merge $sysresources; fi
+if [ -f $sysmodmap ]; then xmodmap $sysmodmap; fi
+if [ -f "$userresources" ]; then xrdb -merge "$userresources"; fi
+if [ -f "$usermodmap" ]; then xmodmap "$usermodmap"; fi
+
+xsetroot -cursor_name left_ptr &
+setxkbmap it
+xrandr --dpi 157
 
 #
 # LAUNCH APPLICATIONS
@@ -111,7 +127,7 @@ if ! pgrep -x "devmon" > /dev/null
 then
         devmon 2>&1 | "$STARTW_ROOT"/addts >> "$STARTX_LOG_FILE" &
 fi
-./.fehbg &
+feh --no-fehbg --bg-fill "$WALLPAPER" &
 polybar -r vantagev1 2>&1 | "$STARTW_ROOT"/addts >> "$STARTX_LOG_FILE" &
 xset s on
 xset s 120/300