diff --git a/.gitignore b/.gitignore
index 93aa0b1..6f9d7f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*.so
+*_old
+.nfs*
 Florian_Hackenberger/
 Luminance/
 QtProject.conf
@@ -6,6 +9,8 @@ Thunar/
 Trolltech.conf
 abiword/
 akonadi/
+anjuta/
+audacious/
 autostart/
 blender/
 chromium
@@ -36,6 +41,7 @@ pcmanfm/
 ristretto/
 roxterm.sourceforge.net/
 spring
+tubus/
 user-dirs.dirs
 user-dirs.locale
 vlc/
diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index f8132c9..a8d6aad 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -10,18 +10,21 @@ hc emit_hook reload
 
 xsetroot -solid '#5A8E3A'
 
-# remove all existing keybindings
+# reset
 hc keyunbind --all
 
-#look for additional monitors
-#/usr/bin/xrandr --output DVI-I-2 --right-of DVI-I-1
- /bin/sh -c "hc detect_monitors"
-
-# keybindings
-# if you have a super key you will be much happier with Mod set to Mod4
-#Mod=Mod1    # Use alt as the main modifier
+#variables
 Mod=Mod4     # Use the super key as the main modifier
 
+#look for additional monitors
+hc detect_monitors
+/usr/bin/xrandr --output DVI-I-2 --right-of DVI-I-1
+
+#start xautolock 
+xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh &
+#xautolock
+
+# keybindings
 #client handling
 hc keybind $Mod-Shift-q quit
 hc keybind $Mod-Shift-p spawn /sbin/poweroff
@@ -31,8 +34,9 @@ hc keybind $Mod-q close
 
 #spawn shit
 hc keybind $Mod-Return spawn urxvt 
-hc keybind $Mod-l spawn bash -c "i3lock -i /home/ik15ydit/.config/i3lock/bg.png"
+hc keybind $Mod-Shift-Return spawn xterm /bin/bash
 hc keybind $Mod-i spawn chromium 
+hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/i3lock_background.png -t
 hc keybind $Mod-p spawn pavucontrol
 hc keybind $Mod-Shift-l spawn libreoffice
 hc keybind $Mod-t spawn icedove
@@ -58,6 +62,17 @@ hc keybind $Mod-Shift-s     shift down
 hc keybind $Mod-Shift-w     shift up
 hc keybind $Mod-Shift-d     shift right
 
+#move across workspaces
+hc keybind $Mod-Shift-1    move 1
+hc keybind $Mod-Shift-2    move 2
+hc keybind $Mod-Shift-3    move 3
+hc keybind $Mod-Shift-4    move 4
+hc keybind $Mod-Shift-5    move 5
+hc keybind $Mod-Shift-6    move 6
+hc keybind $Mod-Shift-7    move 7
+hc keybind $Mod-Shift-8    move 8
+hc keybind $Mod-Shift-9    move 9
+
 # splitting frames
 # create an empty frame at the specified direction
 hc keybind $Mod-h       split   bottom  0.5
diff --git a/herbstluftwm/cwd_spawn.sh b/herbstluftwm/cwd_spawn.sh
new file mode 100644
index 0000000..b485484
--- /dev/null
+++ b/herbstluftwm/cwd_spawn.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+ID=$(xdpyinfo | grep focus | cut -f4 -d " ")
+PID=$(($(xprop -id $ID | grep -m 1 PID | cut -d " " -f 3) + 2))
+if [ -e "/proc/$PID/cwd" ]
+then
+        urxvt -cd $(readlink /proc/$PID/cwd) &
+else
+        urxvt
+fi
+
diff --git a/herbstluftwm/panel.sh b/herbstluftwm/panel.sh
index 24e4d19..94d284a 100755
--- a/herbstluftwm/panel.sh
+++ b/herbstluftwm/panel.sh
@@ -117,7 +117,13 @@ hc pad $monitor $panel_height
         echo -n "$separator"
         echo -n "^bg()^fg() ${windowtitle//^/^^}"
         # small adjustments
-        pwr="Power $(acpi -b | sed -r 's/.* ([0-9]*%).*/\1/')"
+
+        #powersupply
+        pwr="STATIC POWERSUPPLY"
+        if [ $HOSTNAME ~= laptop ] || [$HOSTNAME ~= medion ] ; then
+                pwr="Power $(acpi -b) | sed -r 's/.* ([0-9]*%).*/\1/')"
+        fi
+
         right="^fg(#ff0000) $pwr $separator^bg() $date $separator"
         right_text_only=$(echo -n "$right" | sed 's.\^[^(]*([^)]*)..g')
         # get width of right aligned text.. and add some space..
diff --git a/other/deb_install.sh b/other/deb_install.sh
index 34c21cb..2340c69 100644
--- a/other/deb_install.sh
+++ b/other/deb_install.sh
@@ -1,9 +1,11 @@
-apt install build-essential libtool autoconf
+apt install build-essential libtool autoconf te
 apt install rxvt-unicode zsh xorg herbstluftwm
-apt install git tig python3
+apt install git tig python3 gcc g++ clang default-jdk default-jdk-doc
 apt install vim vim-nox vim-syntax-gtk
-apt install tree tmux pulseaudio htop sudo ncdu
+apt install tree tmux pulseaudio htop sudo ncdu i3lock xautolock
 apt install iw wicd-curses
-apt install iceweasel chromium libreoffice icedove
-apt install kolourpain feh imagemagick
-apt install kvm sleuthkit
\ No newline at end of file
+apt install iceweasel chromium libreoffice icedove gedit
+apt install texlive-full texlive-lang-german texstudio
+apt install kolourpain feh imagemagick gimp
+apt install kvm sleuthkit
+#apt install firmware-ralink firmware-realtek#wireless stick & network card
diff --git a/xconf/.xinitrc b/xconf/.xinitrc
index bf29a49..a8121a9 100644
--- a/xconf/.xinitrc
+++ b/xconf/.xinitrc
@@ -1 +1,3 @@
-/usr/bin/xrandr --output DVI-I-2 --right-of DVI-I-1
+#!/bin/bash
+xrdb /home/ik15ydit/.Xresources
+exec herbstluftwm
diff --git a/zshrc b/zshrc
index 86b90f5..5570067 100644
--- a/zshrc
+++ b/zshrc
@@ -5,7 +5,7 @@ PS1=$'%F{yellow}%m%f%F{red}:%f%F{cyan}%~%f\n'$CMD_START #promt
 #coloring stderr, causes problems in output odering
 #exec 2>>( while IFS='' read X; do print "\e[91m${X}\e[0m" > /dev/tty; done & )
 #better by rudi_s
-LD_PRELOAD='/home/ik15ydit/.config/libcoloredstderr.so'
+LD_PRELOAD="$HOME/.config/libcoloredstderr.so"
 COLORED_STDERR_FDS=2,
 export LD_PRELOAD COLORED_STDERR_FDS
 
@@ -52,9 +52,14 @@ alias ..='cd ..'
 #general shortcuts
 alias psearch="apt-cache search"
 alias i3lock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png"
+alias hlock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png -t"
 #alias telegram='~/ciptmp/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub'
 alias x='startx'
 
+#ignore errormessages that are useless anyway
+alias gedit="gedit 2>/dev/null"
+alias kpaint="kolourpaint 2>/dev/null"
+
 #converting
 alias -g jpg2png="echo 'use convert [file_in.jpg] [file_out.png]'" 
 #alias txt2pdf="cat $1 | iconv -c -f utf-8 -t ISO-8859-1 | enscript -o document.ps; ps2pdf document.ps $2"
@@ -77,13 +82,19 @@ alias umountcip="fusermount -u $HOME/cip/"
 alias hlconf="vim ~/.config/herbstluftwm/autostart"
 alias zshconf="vim ~/.zshrc"
 alias vimconf="vim ~/.vimrc"
+alias sshconf="vim ~/.ssh/config"
 
 #ambigious aliases
 alias dual="xrandr --output DVI-I-2 --right-of DVI-I-1"
+alias hlmove="herbstclient move"
 alias shutown="/sbin/poweroff"
 alias pcolor='for i in {0..255} ; do printf "\x1b[38;5;${i}mcolour${i} "; if [[ $(((($i+3)/6)*6)) -eq $(($i+3)) ]]; then echo; fi; done'
 alias backlightctl="tee /sys/class/backlight/intel_backlight/brightness <<< $1"
 
+#AuD and java
+alias javac-all-test4='javac -cp .:/usr/share/java/junit4.jar *.java'
+alias java-test4='java -cp .:/usr/share/java/junit4.jar'
+
 #aliases migrated from bashrc
 alias spc='gcc -std=c99 -pedantic -Wall -Werror -D_XOPEN_SOURCE=700 -o'
 alias woist='ssh ircbox nc localhost 1339 | grep -B1 " in .zshrci'