diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index e05cd05..2155a84 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -12,7 +12,7 @@ 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
 
@@ -23,8 +23,10 @@ Mod=Mod4     # Use the super key as the main modifier
 ### All Machines ####
 ### 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 ###
@@ -32,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"
@@ -217,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/ssh/config b/ssh/config
index 90aea31..332ea13 100644
--- a/ssh/config
+++ b/ssh/config
@@ -1,5 +1,5 @@
 Host gitlab.cs.fau.de
-    IdentityFile ~/.gitrsa
+    IdentityFile ~/.ssh/gitrsa
 Host *.fauiwg.de
     IdentityFile ~/.ssh/wg
 Host *.cs.fau.de
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 ##