diff --git a/i3/i3/config b/i3/i3/config
index ae1710c..1674889 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -181,7 +181,7 @@
 
     ### START APPLICATIONS #####################################################
 
-    bindsym $mod+d exec j4-dmenu-desktop --dmenu="dmenu -b -i -l 10 -p '>'"
+    bindsym $mod+d exec j4-dmenu-desktop --dmenu="dmenu -b -i -l 10 -p '>' -nb '#222222' -nf '#ffffff' -sb '#e16b40' -sf '#000000'"
     bindsym $mod+Return exec $terminal
     bindsym $mod+F1 exec firefox
 
diff --git a/i3/i3/config.d/notebook.config b/i3/i3/config.d/notebook.config
index d6a9838..14ee9c6 100644
--- a/i3/i3/config.d/notebook.config
+++ b/i3/i3/config.d/notebook.config
@@ -15,6 +15,8 @@ bindsym XF86AudioNext exec --no-startup-id mpc next
 # font for window titles. ISO 10646 = Unicode
 font pango:DejaVu Sans Mono 11
 
+bindsym $mod+o exec --no-startup-id ~/.i3/scripts/monitor/monitor.sh
+
 
 # start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
diff --git a/i3/i3/conky/virtualarch.conkyrc b/i3/i3/conky/virtualarch.conkyrc
index fe16a86..5c1d768 100644
--- a/i3/i3/conky/virtualarch.conkyrc
+++ b/i3/i3/conky/virtualarch.conkyrc
@@ -17,21 +17,14 @@ update_interval_on_battery 1.0
 
 TEXT
 [\
-${if_mpd_playing}\
-{ "full_text" : "\
-${if_match "${mpd_status}" == "Paused"}\
-\
-${else}\
-\
-${endif}\
-  ~ " , "name" : "mpd_toggle" ,"separator" : false , "separator_block_width" : 0 },\
-${endif}\
-\
-\
-\
 { "full_text" : "\
 ${if_running mpd}\
 ${if_mpd_playing}\
+${if_match "${mpd_status}" == "Paused"}\
+   \
+${else}\
+   \
+${endif}\
 ${mpd_artist} - ${mpd_title} ${mpd_elapsed}/${mpd_length}\
 ${else}\
    stopped\
@@ -39,7 +32,7 @@ ${endif}\
 ${else}\
    down\
 ${endif}\
- " , "name" : "mpd" },\
+ " , "name" : "mpd_toggle" },\
 \
 \
 \
diff --git a/i3/i3/scripts/genconfig.bash b/i3/i3/scripts/genconfig.bash
old mode 100644
new mode 100755
diff --git a/i3/i3/scripts/i3exit.bash b/i3/i3/scripts/i3exit.bash
index 8478ac5..2abea31 100755
--- a/i3/i3/scripts/i3exit.bash
+++ b/i3/i3/scripts/i3exit.bash
@@ -28,7 +28,7 @@ lock()
         log "[W] Lockscreen not  found, using color #$FALLBACK_COLOR as background."
         background_options="--color $FALLBACK_COLOR"
     fi
-    i3lock $background_options
+    i3lock $background_options #-p win --image "$HOME/pictures/windows-lockscreen.jpg"
     retval=$?
     [[ -z "$1" ]] && sleep 1 && xset dpms force off
     return $retval
@@ -51,7 +51,7 @@ case "$1" in
         ;;
     hibernate)
         log "[I] Hibernating."
-        #lock && 
+        #lock &&
         systemctl hibernate
         ;;
     reboot)
diff --git a/i3/i3/scripts/pa-volume.bash b/i3/i3/scripts/pa-volume.bash
old mode 100644
new mode 100755
index 7efad4c..ce31262
--- a/i3/i3/scripts/pa-volume.bash
+++ b/i3/i3/scripts/pa-volume.bash
@@ -19,6 +19,11 @@ setvol() {
         else
             echo "-"
             newvol=$(( $oldvol - $delta ))
+            echo $newvol
+        fi
+        if [[ $newvol -gt 100 ]]; then
+            echo "capping at 100 percent"
+            newvol=100
         fi
         echo "newvol $newvol"
     else
diff --git a/i3/i3/scripts/status.d/battery.bash b/i3/i3/scripts/status.d/battery.bash
old mode 100644
new mode 100755
diff --git a/i3/i3/scripts/status.d/conky_pacman.bash b/i3/i3/scripts/status.d/conky_pacman.bash
old mode 100644
new mode 100755
diff --git a/i3/i3/scripts/status.d/pacman.bash b/i3/i3/scripts/status.d/pacman.bash
old mode 100644
new mode 100755
index 54ba9f4..684fb03
--- a/i3/i3/scripts/status.d/pacman.bash
+++ b/i3/i3/scripts/status.d/pacman.bash
@@ -1,6 +1,9 @@
 #!/bin/bash
-
 echo "Total packages: $(pacman -Qq | wc -l)"
-echo ""
-echo "Updates available:"
-echo "$(pacman -Qu | column -t)"
+echo
+if ! pacman -Qu >/dev/null 2>&1; then
+    echo "Up to date."
+else
+    echo "Available updates:"
+    echo "$(pacman -Qu | column -t)"
+fi
diff --git a/i3/i3/scripts/status.d/sysinfo.bash b/i3/i3/scripts/status.d/sysinfo.bash
old mode 100644
new mode 100755
index c7d23de..3895cd1
--- a/i3/i3/scripts/status.d/sysinfo.bash
+++ b/i3/i3/scripts/status.d/sysinfo.bash
@@ -16,7 +16,6 @@ echo ""
 echo "CPU:"
 (echo "Name:|$(lscpu | grep "Model name:" | tr -s " " | cut -d " " -f 3-)"
 echo "Architecture:|$(uname -m)"
-echo "Temp:|$(sensors -u | grep "temp1_input" | cut -d ":" -f 2 | cut -d "." -f 1 | cut -c 2-)°C"
 echo "Load:|$(uptime | tr -s " " | cut -d " " -f 10 | tr -d ",")") | columnate
 echo ""
 echo "MEM:"
@@ -31,5 +30,15 @@ echo ""
 echo "SWAP:"
 if [[ -z "$(swapon)" ]] ; then
     echo "none"
+else
+    i=0
+    swapon | (while read line; do
+        [[ $i == 0 ]] && { i=1 ; continue ; }
+        swappath=$(echo $line | cut -d ' ' -f 1)
+        swapused=$(echo $line | cut -d ' ' -f 4)
+        swaptotal=$(echo $line | cut -d ' ' -f 3)
+
+        echo "${swappath}:|${swapused}/${swaptotal}"
+    done) | columnate
 fi
 
diff --git a/i3/i3/scripts/status.d/wireless.bash b/i3/i3/scripts/status.d/wireless.bash
old mode 100644
new mode 100755
diff --git a/setup/list b/setup/list
deleted file mode 100644
index 904c458..0000000
--- a/setup/list
+++ /dev/null
@@ -1,144 +0,0 @@
-# de / wm
-### internet
-# torrents
-deluge
-# instant messaging/VOIP
-pidgin
-# irc
-quassel-core
-quassel-client
-# email
-thunderbird
-# network manager
-netctl
-wpa_supplicant
-wpa_actiond
-iw
-# browser
-firefox
-flashplugin
-# ftp
-filezilla
-# ssh
-openssh
-putty
-
-### multimedia
-# image viewers
-geeqie
-feh
-# image manipulation
-gimp
-# audio players
-mpg123
-clementine
-mpd
-mpc
-ncmpcpp
-# video players
-vlc
-
-### utilities
-# compression
-p7zip
-# file managers
-thunar
-thunar-archive-plugin
-thunar-media-tags-plugin
-ranger
-# taskbars / docks
-docky
-conky
-dzen2
-
-### documents
-# pdf reader
-epdfview
-# office suites
-libreoffice
-
-### security
-# network
-ntop
-wireshark-cli
-wireshark-gtk
-# backup programs
-rsnapshot
-rsync
-# encryption
-gnupg
-truecrypt
-encfs
-# calculators
-
-### console
-# shells
-zsh
-# terminal emulators
-rxvt-unicode
-
-# text editors
-mousepad
-vim
-
-# development
-git
-bzr
-eclipse
-
-# programming languages
-python2-xdg
-python-docs
-python-pip
-python-pylint
-
-### desktop environments
-# i3
-i3-wm
-i3lock
-i3status
-dmenu
-
-### system
-# audio stack
-alsa-utils
-redshift
-
-# console
-curl
-wget
-htop
-powertop
-xorg-xev
-xorg-xfontsel
-xorg-xkill
-xorg-xprop
-
-### system
-# disks / filesystems
-sshfs
-gptfdisk
-# kernel
-linux-headers
-# misc
-ntp
-cowsay
-fortune-mod
-lsb-release
-
-### appearance
-# X
-lxappearance
-oxygen-gtk2
-oxygen-gtk3
-xcursor-vanilla-dmz
-
-### fonts
-ttf-dejavu
-
-# X
-xorg-server
-xorg-server-utils
-xorg-apps
-xorg-server-xephyr
-xorg-xinit
diff --git a/setup/packages-foreign.list b/setup/packages-foreign.list
new file mode 100644
index 0000000..9373e28
--- /dev/null
+++ b/setup/packages-foreign.list
@@ -0,0 +1,18 @@
+chromium-libpdf
+chromium-pepper-flash
+cower
+dropbox
+fontconfig-infinality-git
+freetype2-infinality-git
+gtk-theme-boje
+imgurbash
+j4-dmenu-desktop
+lib32-freetype2-infinality-git
+pacaur
+pasystray-git
+thunar-dropbox
+thunar-shares-plugin
+thunar-vfs
+ttf-font-icons
+virtualbox-ext-oracle
+yad
diff --git a/setup/packages-native.list b/setup/packages-native.list
new file mode 100644
index 0000000..7206486
--- /dev/null
+++ b/setup/packages-native.list
@@ -0,0 +1,171 @@
+acpi
+alsa-utils
+atop
+baobab
+blender
+btrfs-progs
+bzr
+cdparanoia
+chromium
+chrony
+clementine
+cmake
+codespell
+conky
+cowsay
+cronie
+dd_rescue
+deluge
+d-feet
+dialog
+dnsutils
+dosfstools
+efibootmgr
+encfs
+expac
+feh
+filezilla
+firefox
+flake8
+fortune-mod
+fuseiso
+gcolor2
+gimp
+git
+gnuplot
+gparted
+gptfdisk
+grub
+gsmartcontrol
+gvfs
+gvim
+hardinfo
+hedgewars
+htop
+i3lock
+i3status
+i3-wm
+icedtea-web-java7
+ifplugd
+iftop
+imagemagick
+inkscape
+iotop
+lib32-alsa-plugins
+lib32-fakeroot
+lib32-intel-dri
+lib32-mesa-demos
+lib32-mpg123
+lib32-ncurses
+lib32-openal
+lib32-qtcurve-gtk2
+lib32-qtcurve-qt4
+libreoffice-calc
+libreoffice-draw
+libreoffice-gnome
+libreoffice-impress
+libreoffice-math
+libreoffice-postgresql-connector
+libreoffice-sdk-doc
+libreoffice-writer
+libtool-multilib
+libva-intel-driver
+linux-headers
+lsb-release
+lxappearance
+mono
+mono-basic
+mousepad
+mpc
+mpd
+mplayer
+mtools
+mupdf
+ncmpcpp
+net-tools
+p7zip
+pavucontrol
+pdnsd
+pidgin
+pinta
+powertop
+puddletag
+pulseaudio
+pulseaudio-alsa
+putty
+pv
+python-docs
+python-pip
+python-pylint
+python-pyqt4
+python-pyqt5
+python-sphinx
+python-virtualenv
+qtcurve-gtk2
+qtcurve-qt4
+qtcurve-qt5
+quassel-client
+quassel-core
+ranger
+redshift
+reflector
+rsync
+rxvt-unicode
+samba
+scrot
+skype
+sshfs
+steam
+subversion
+syslinux
+thunar
+thunar-archive-plugin
+thunar-media-tags-plugin
+thunar-volman
+thunderbird
+tk
+tmux
+tree
+ttf-ubuntu-font-family
+ttf-dejavu
+tumbler
+units
+unrar
+virtualbox
+virtualbox-guest-iso
+virtualbox-host-dkms
+virtualbox-host-modules
+vlc
+vnstat
+wget
+wine
+wine_gecko
+wine-mono
+winetricks
+wireshark-gtk
+wpa_actiond
+wpa_supplicant
+xarchiver
+xbindkeys
+xclip
+xcursor-vanilla-dmz
+xf86-input-synaptics
+xf86-video-intel
+xfce4-panel
+xlockmore
+xorg-server
+xorg-sessreg
+xorg-utils
+xorg-xbacklight
+xorg-xcmsdb
+xorg-xev
+xorg-xgamma
+xorg-xhost
+xorg-xinit
+xorg-xinput
+xorg-xkill
+xorg-xmodmap
+xorg-xrdb
+xorg-xrefresh
+youtube-dl
+zsh
diff --git a/x/Xresources b/x/Xresources
index 278e0e1..402e925 100644
--- a/x/Xresources
+++ b/x/Xresources
@@ -17,7 +17,7 @@ URxvt.intensityStyles: false
 
 URxvt.saveLines: 10000
 
-URxvt.fading: 40
+URxvt.fading: 30
 
 URxvt.termName: urxvt