diff --git a/user-config/bash_aliases b/user-config/bash_aliases
index 8226498..0180113 100644
--- a/user-config/bash_aliases
+++ b/user-config/bash_aliases
@@ -60,22 +60,28 @@ alias cputemp='watch -n 0.01 sensors'
 alias wtfip='dig +short myip.opendns.com @resolver1.opendns.com'
 
 # systemd-nspawn containers
+nspawn_root_dir="/var/lib/machines"
 
 # ArchLinux
-alias alct='snr ArchLinux -b'
+alias alct="sudo systemd-nspawn -D $nspawn_root_dir/ArchLinux"
 alias alshell='machinectl shell ArchLinux'
 
 # BlackArch
-alias bact='snr BlackArch -b'
+alias bact="sudo systemd-nspawn -D $nspawn_root_dir/BlackArch"
 alias bashell='machinectl shell BlackArch'
 
 # Debian
-alias debct='snr Debian -b'
+alias debct="sudo systemd-nspawn -D $nspawn_root_dir/Debian"
 alias debshell='machinectl shell Debian'
 
-alias kact='snr KaliLinux -b'
+# Kali
+alias kact="sudo systemd-nspawn -D $nspawn_root_dir/KaliLinux"
 alias kashell='machinectl shell KaliLinux'
 
+# ParrotSec
+alias pact="sudo systemd-nspawn -D $nspawn_root_dir/ParrotSec"
+alias pashell='machinectl shell ParrotSec'
+
 # Alias to start VirtualBox Machines in Headless mode
 # alias vbstart='VBoxHeadless -s'
 
diff --git a/user-config/bashrc b/user-config/bashrc
index d0db417..402c725 100644
--- a/user-config/bashrc
+++ b/user-config/bashrc
@@ -66,7 +66,7 @@ cyan="$(tput bold; tput setaf 6)"
 nc="$(tput sgr0)"
 
 if [ "$color_prompt" = yes ]; then
-  PS1='\[$blue\][ \[$cyan\]\H \[$darkgrey\]\w\[$darkgrey\] \[$blue\]]\[$blue\]$(__git_ps1)\n└─ ▶\[$nc\] '
+  PS1='\[$blue\][ \[$cyan\]\H \[$darkgrey\]\w\[$darkgrey\] \[$blue\]]\[$blue\]$(__git_ps1)\n└─▶\[$nc\] '
 else
     PS1='\u@\h:\w\$ '
 fi
@@ -145,7 +145,7 @@ export TERM=xterm-256color
 ### Source scripts ###
 # Git prompt, see https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh
 if [ -f ~/.local/bin/git-prompt.sh ]; then
-  source /home/sechacklabs/.local/bin/git-prompt.sh
+  source $HOME/.local/bin/git-prompt.sh
 fi
 
 #if [ -f /usr/share/doc/pkgfile/command-not-found.bash ]; then
@@ -154,11 +154,5 @@ fi
 
 # Autostart X at login
 if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-  _JAVA_AWT_WM_NONREPARENTING=1 GST_VAAPI_ALL_DRIVERS=1 QT_QPA_PLATFORM=wayland-egl QT_QPA_PLATFORMTHEME=qt5ct XDG_CURRENT_DESKTOP=Unity MOZ_ENABLE_WAYLAND=1 XKB_DEFAULT_LAYOUT=latam sway
-  # GST_VAAPI_ALL_DRIVERS=1 QT_QPA_PLATFORMTHEME=qt5ct XKB_DEFAULT_LAYOUT=latam startx
-<<<<<<< HEAD
-  # enlightenment_start
-=======
-  # _JAVA_AWT_WM_NONREPARENTING=1 GST_VAAPI_ALL_DRIVERS=1 QT_QPA_PLATFORM=wayland-egl QT_QPA_PLATFORMTHEME=qt5ct XDG_CURRENT_DESKTOP=Unity MOZ_ENABLE_WAYLAND=1 enlightenment_start
->>>>>>> 49f188a... Upload.
+  VDPAU_DRIVER=nvidia QT_QPA_PLATFORMTHEME=qt5ct XKB_DEFAULT_LAYOUT=latam startx
 fi
diff --git a/user-config/xinitrc b/user-config/xinitrc
index 2f7f6f2..55a9212 100755
--- a/user-config/xinitrc
+++ b/user-config/xinitrc
@@ -7,5 +7,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     unset f
 fi
 
+xrdb -merge ~/.Xresources
+# xrandr --output HDMI1 --primary --mode 1920x1080 --dpi 120 --rate 60
+# xrandr --output eDP1 --off
 # Execute i3wm
-exec i3
+# exec i3
+XDG_SESSION_TYPE=x11
+xhost +local:
+exec startxfce4