diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index e89357c..d80f0f6 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -27,13 +27,14 @@ if [[ "$HOST" == "atlantispc" ]]; then
     #hc detect_monitors
     hc set swap_monitors_to_get_tag 0
     hc set_monitors 3840x1080+0+0
+    hc keybind $Mod-o spawn /bin/bash -c "/home/sheppy/.config/i3lock/piclock.sh && sudo s2disk"
 fi
 ### Atlantislaptop specific setup ###
 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)"'
     #/usr/bin/dunst & 
-    hc keybind $Mod-o spawn /bin/bash -c "/home/ik15ydit/.config/i3lock/piclock.sh & systemctl hibernate"
+    hc keybind $Mod-o spawn /bin/bash -c "/home/ik15ydit/.config/i3lock/piclock.sh && sudo s2disk"
 fi
 
 ### Atlantis general
diff --git a/zshrc b/zshrc
index e56dd29..b1dcc5b 100644
--- a/zshrc
+++ b/zshrc
@@ -1,8 +1,21 @@
-#### SET CONDITIONALS ####
+### COLOR STDERR ###
 NO_LDPRELOAD=false
 if [[ $HOST == "squarez" ]]; then
     NO_LDPRELOAD=true
 fi
+if [[ $NO_LDPRELOAD == false ]]; then
+    LD_PRELOAD="$HOME/.config/libcoloredstderr.so"
+    COLORED_STDERR_FDS=2,
+    export LD_PRELOAD COLORED_STDERR_FDS
+fi
+
+if [[ $FIRST_RUN == "FALSE" ]]; then
+    ;
+else
+    FIRST_RUN="FALSE"
+    export FIRST_RUN
+    exec zsh
+fi
 
 #### ZSH-INTERNAL ####
 ### HISTORY ###
@@ -10,13 +23,7 @@ STSIZE=20000
 SAVEHIST=20000
 HISTFILE=~/.config/zshhistory.log
 
-### COLOR STDERR ###
-#legacy, this causes problems in output odering exec 2>>( while IFS='' read X; do print "\e[91m${X}\e[0m" > /dev/tty; done & )
-if [[ $NO_LDPRELOAD == false ]]; then
-    LD_PRELOAD="$HOME/.config/libcoloredstderr.so"
-    COLORED_STDERR_FDS=2,
-    export LD_PRELOAD COLORED_STDERR_FDS
-fi
+
 
 ### PROMT ###
 MAIN_PROMT_COLOR="green"
@@ -259,11 +266,7 @@ hhs(){print -z "$(cat ~/.config/zshhistory.log | $PECO/peco)"}
 zle -N hhstest hhs
 bindkey ^R hhstest
 
-### Experimental ###
-source ~/.config/other/zsh-history-substring-search.zsh
-bindkey '^[[5~' history-substring-search-up
-bindkey '^[[6~' history-substring-search-down
-alias genserverkey='openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 100000'
+### LD PRELOAD FOR ZSH ###
 if [[ $FIRST_RUN == "FALSE" ]]; then
     ;
 else