diff --git a/basic_setup/symlinks.sh b/basic_setup/symlinks.sh
index 9b77797..41c6c75 100755
--- a/basic_setup/symlinks.sh
+++ b/basic_setup/symlinks.sh
@@ -1,5 +1,5 @@
 ln -s ~/.config/vim/rc ~/.vimrc
 ln -s ~/.config/zshrc ~/.zshrc
 ln -s ~/.config/xconf/Xressources ~/.Xressources
-ln -s ~/.config/xconf/.xsessionsrc ~/.xsessionrc
+ln -s ~/.config/xconf/.xsessionsrc ~/.xinitrc
 mkdir -p ~/.zsh
diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index df8cb06..2155a84 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -12,23 +12,21 @@ xsetroot -solid '#5A8E3A'
 
 # reset
 hc keyunbind --all
-pkill dunst
+#pkill dunst
 pkill xautolock
 pkill -s 15 hl_pracct   #send SIGTERM for correct termination during write
-pkill ssh-agent         #correctly terminate the current agent
 
 #variables
 Mod=Mod4     # Use the super key as the main modifier
 
 ######### MACHINE SPECIFIC SETUP #########
 ### All Machines ####
-if [ -f $HOME/.config/agent_socket ]; then
-    eval `ssh-agent -a /tmp/ssh-$(cat $HOME/.config/agent_socket)`
-fi
 ### Atlantis PC-specific setup ###
 if [[ "$HOST" == "atlantispc" ]]; then
+    /usr/bin/xrandr --output DVI-D-1 --left-of HDMI-1
     hc detect_monitors
-    /usr/bin/xrandr --output DVI-I-2 --right-of DVI-I-1
+    hc set swap_monitors_to_get_tag 0
+    #hc set_monitors 3840x1080+0+0
     xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh &
 fi
 ### Atlantislaptop specific setup ###
@@ -36,7 +34,7 @@ if [[ "$HOST" == "atlantislaptop" ]]; then
     hc keybind XF86MonBrightnessUp spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) + 5)"' 
     hc keybind XF86MonBrightnessDown spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) - 5)"'
     xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh &
-    /usr/bin/dunst & 
+    #/usr/bin/dunst & 
     hc keybind $Mod-o spawn /bin/bash -c "/home/ik15ydit/.config/i3lock/piclock.sh & systemctl hibernate"
     hc keybind $Mod-c spawn /bin/bash -c "sudo /usr/bin/openvpn_cip.sh & ~/.config/herbstluftwm/hl_status_deamon.py --refresh"
     hc keybind $Mod-Shift-c spawn /bin/bash -c "sudo stopvpn.sh && ~/.config/herbstluftwm/hl_status_deamon.py --refresh"
@@ -221,7 +219,7 @@ hc rule focus=on # normally focus new clients
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' pseudotile=on
 hc rule windowtype='_NET_WM_WINDOW_TYPE_DIALOG' focus=on
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' manage=off
-hc rule --instance=chromium-browser --ewmhrequests=off
+hc rule --instance=chromium --ewmhrequests=off
 
 # unlock, just to be sure
 hc unlock
diff --git a/herbstluftwm/hl_panel_content.py b/herbstluftwm/hl_panel_content.py
index 54f704f..cd9d31f 100755
--- a/herbstluftwm/hl_panel_content.py
+++ b/herbstluftwm/hl_panel_content.py
@@ -75,12 +75,14 @@ def guthaben():
 
 def vpn():
         vpn = ''
-        if not hl_utils.is_cip():
+        if hl_utils.is_cip():
+                return ''
+        else:
                 tmp = -1
                 with open(hl_utils.hlpath("vpn_status.log")) as f:
                         tmp = f.read()
                         tmp = ' '+tmp
-        return tmp;
+                return tmp;
 
 def battery():
         if hl_utils.is_laptop():
diff --git a/other/package_list_desktop_essential.txt b/other/package_list_desktop_essential.txt
index dc740c9..39dbd5d 100644
--- a/other/package_list_desktop_essential.txt
+++ b/other/package_list_desktop_essential.txt
@@ -5,10 +5,10 @@ htop            ;#taskmanager
 i3lock          ;#screenlock
 katarakt        ;#simple and performant pdfviewer
 pulseaudio      ;#sound
+alsa-utils      ;#implicit dependency of pulseaudio
 rxvt-unicode-256color ;#terminal-emulator
 sudo            ;#execute as root
 tmux            ;#terminal multiplexer (multiple terminals within one)
-usbutils        ;#usefullshit for usbdevices
 vim-nox         ;#good consol texeditor with script support
 zsh             ;#much better shell than bash
 x11-xserver-utils ;#xrandr
diff --git a/other/package_list_full.txt b/other/package_list_full.txt
index 873bd4f..42f2536 100644
--- a/other/package_list_full.txt
+++ b/other/package_list_full.txt
@@ -1,16 +1,11 @@
 acpi            ;#check battery
-apt             ;#advanced installer
-aptitude        ;#advanced installer
-arping          ;#find all devices in network
 autoconf        ;#used for building LD_PRELOAD
-bison           ;#used for gene (bachelorarbeit)
 build-essential ;#make
 chromium        ;#internet
 colordiff       ;#colored diff
 coreutils       ;#many usefull tools
 cron            ;#execute tasks automaticly at certain times
 cscope          ;#find shit in big repros
-dunst           ;#notification deamon for notify-send
 dzen2           ;#used for herbsluftclient panel
 eclipse         ;#java programming enviroment
 enscript        ;#used for pdf/ps stuff
@@ -20,16 +15,15 @@ exfat-fuse      ;#mount exfat devices as user
 exfat-utils     ;#more options for exfat
 feh             ;#simple pictureviewer
 findutils       ;#find things
-gcc-4.9-base    ;#C-Compiler
+gcc             ;#C-Compiler
 g++             ;#C++ compiler
 gcp             ;#copy with statusbar
 gedit           ;#graphical texteditor
-geparted        ;#partitionmanagement
+gparted        ;#partitionmanagement
 git             ;#version controll system
 grep            ;#search for keywords
 gzip            ;#compress
 herbstluftwm    ;#windowmanager
-hgsubversion    ;#(shitty) version control system needed for aud
 htop            ;#taskmanager
 i3lock          ;#screenlock
 icedove         ;#email client
@@ -41,7 +35,6 @@ iputils-ping    ;#tracerout and ping
 iw              ;#information about network interfaces
 katarakt        ;#simple and performant pdfviewer
 kolourpaint4    ;#simple pictureeditor
-less            ;#simple textview
 libreoffice     ;#documenteditor like open office
 lm-sensors      ;#CPU/GraKa (temperatur) sensors
 nano            ;#very simple to use consol-texteditor
@@ -52,22 +45,20 @@ openssh-client  ;#ssh
 pandoc          ;#used for pdf conversion
 pavucontrol     ;#sound control
 pdf-presenter-console   ;#simple pdfviewer usefull for presentations
-poppler-utils   ;#extract images from pdfs
+poppler-utils   ;#extract images from pdfs (MarkingBird)
 pulseaudio      ;#sound
 python          ;#python
 python-pdfminer ;#needed for markingbird
 python-pip      ;#install python modules
-python-psutils  ;#needed for hl_start_urxvt_cwd.py (hlconfig)
+python-psutil   ;#needed for hl_start_urxvt_cwd.py (hlconfig)
 qemu-kvm        ;#virtual machine
 rofi            ;#easier find/switch between open windows
 rxvt-unicode-256color ;#terminal-emulator
 sed             ;#regex stream manipulation (used for hl-panel)
-sleuthkit       ;#forensik utilities
 sshfs           ;#mount harddrives over ssh
 strace          ;#track behaviour or processes
 sudo            ;#execute as root
 tar             ;#compressing/unpacking
-tesseract-ocr   ;#optical character/text recognition
 texlive-full    ;#tex (Achtung groß)
 texmaker        ;#tex gui
 tig             ;#git history
@@ -81,6 +72,4 @@ whois           ;#lookup ips etc of DNS adresses
 wicd-curses     ;#good simple networkmanager
 wine            ;#windows emuator
 winetricks      ;#windows emulator utilities
-xorg            ;#needed for nearly all windowmangers
 xpra            ;#open graphical window on remote pc
-zsh             ;#much better shell than bash
diff --git a/ssh/config b/ssh/config
new file mode 100644
index 0000000..332ea13
--- /dev/null
+++ b/ssh/config
@@ -0,0 +1,6 @@
+Host gitlab.cs.fau.de
+    IdentityFile ~/.ssh/gitrsa
+Host *.fauiwg.de
+    IdentityFile ~/.ssh/wg
+Host *.cs.fau.de
+    IdentityFile ~/.ssh/cipkey
diff --git a/xconf/.xinitrc b/xconf/.xinitrc
index a8121a9..ecb5f13 100644
--- a/xconf/.xinitrc
+++ b/xconf/.xinitrc
@@ -1,3 +1,3 @@
-#!/bin/bash
-xrdb /home/ik15ydit/.Xresources
+xrdb ~/.Xressources
+eval `ssh-agent`
 exec herbstluftwm
diff --git a/xconf/.xsessionrc b/xconf/.xsessionrc
deleted file mode 100644
index e69de29..0000000
diff --git a/zshrc b/zshrc
index 1f4005a..17be92d 100644
--- a/zshrc
+++ b/zshrc
@@ -157,7 +157,7 @@ fi
 
 ## CONNECT UNI ##
 alias irc="ssh ircbox.cs.fau.de -t 'command; tmux a'"
-alias -g uni="faui06c.cs.fau.de"
+alias -g uni="ik15ydit@faui06c.cs.fau.de"
 alias cipkey="ssh-add ~/.ssh/ciplogin"
 alias cipra="xpra start ssh:ik15ydit@faui00n.cs.fau.de:100 --start-child urxvt"
 alias mountcip="sshfs ik15ydit@faui00n.cs.fau.de:/ -o idmap=user $CIP_MOUNTPOINT"
@@ -180,8 +180,8 @@ if [[ $HOST =~ faui* ]]; then
 fi
 ## MOUNTABLE CIP-SHORTCUTS ##
 if [[ $HOST =~ atlantis* ]]; then
-    alias ciptmp="cd ~/mountpoints/cip_root/proj/ciptmp/ik15ydit/"
-    alias ciphome="cd ~/mountpoints/cip_root/home/cip/2013/ik15ydit/"
+    alias -g ciptmp="~/mountpoints/cip_root/proj/ciptmp/ik15ydit/"
+    alias -g ciphome="~/mountpoints/cip_root/home/cip/2013/ik15ydit/"
 fi
 
 ## DIPLAY CONTROL ##