diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index c5a81a3..0fd6018 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -59,7 +59,7 @@ hc keybind $Mod-q close
 
 #spawn shit
 hc keybind $Mod-Return spawn urxvt 
-hc keybind $Mod-Shift-Return spawn ~/.config/herbstluftwm/cwd_helper.py
+hc keybind $Mod-Shift-Return spawn ~/.config/herbstluftwm/hl_start_urxvt.py
 hc keybind $Mod-i spawn urxvt -e nohup zsh -c "chromium &" #need to reliably use the zshconf chromium
 if [[ $HOST =~ atlantis* ]]; then
     hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/bg.png -t
diff --git a/herbstluftwm/panel_content.py b/herbstluftwm/hl_panel_content.py
similarity index 100%
rename from herbstluftwm/panel_content.py
rename to herbstluftwm/hl_panel_content.py
diff --git a/herbstluftwm/cwd_helper.py b/herbstluftwm/hl_start_urxvt_cwd.py
similarity index 100%
rename from herbstluftwm/cwd_helper.py
rename to herbstluftwm/hl_start_urxvt_cwd.py
diff --git a/herbstluftwm/hl_pracct_deamon.py b/herbstluftwm/hl_status_deamon.py
similarity index 100%
rename from herbstluftwm/hl_pracct_deamon.py
rename to herbstluftwm/hl_status_deamon.py
diff --git a/herbstluftwm/panel.sh b/herbstluftwm/panel.sh
index 8998e2e..564ffba 100755
--- a/herbstluftwm/panel.sh
+++ b/herbstluftwm/panel.sh
@@ -118,7 +118,7 @@ hc pad $monitor $panel_height
         echo -n "^bg()^fg() ${windowtitle//^/^^}"
         
         ####################### Interface to python layer #########################
-        right="30. Mai 14 Kobras |$($HOME/.config/herbstluftwm/panel_content.py) $date" 
+        right="30. Mai 14 Kobras |$($HOME/.config/herbstluftwm/hl_panel_content.py) $date" 
 
         right_text_only=$(echo -n "$right" | sed 's.\^[^(]*([^)]*)..g')
         # get width of right aligned text.. and add some space..
diff --git a/herbstluftwm/wsbar.sh b/herbstluftwm/wsbar.sh
deleted file mode 100755
index a4142bb..0000000
--- a/herbstluftwm/wsbar.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-FG='white'
-BG='black'
-FONT="-*-fixed-medium-*-*-*-12-*-*-*-*-*-*-*"
-
-function uniq_linebuffered() {
-   awk '$0 != l { print ; l=$0 ; fflush(); }' "$@"
-}
-
-{
-   conky -c ~/.conkyrc_herbstluft | while read -r; do
-      echo -e "conky $REPLY";
-      #break
-   done > >(uniq_linebuffered) &
-   childpid=$!
-   herbstclient --idle
-   kill $childpid
-} | {
-   TAGS=( $(herbstclient tag_status $monitor) ) 
-      conky=""
-      separator="^fg(#1793D0)^ro(1x16)^fg()"
-      while true; do
-         for i in "${TAGS[@]}" ; do
-            echo -n "^ca(1,herbstclient use ${i:1}) "
-            case ${i:0:1} in
-            '#')
-               echo -n "^fg(#1793D0)[^fg(#FFFFFF)${i:1}^fg(#1793D0)]"
-               ;;
-            ':')
-               echo -n "^fg(#FFFFFF) ${i:1} "
-               ;;
-            *)
-               echo -n "^fg(#123456) ${i:1} "
-               ;;
-            esac
-            echo -n "^ca()"
-        done
-        echo -n " $separator"
-        conky_text_only=$(echo -n "$conky"|sed 's.\^[^(]*([^)]*)..g')
-        width=$(textwidth "$FONT" "$conky_text_only  ")
-        echo -n "^p(_RIGHT)^p(-$width)$conky"
-        echo
-        read line || break
-        cmd=( $line )
-   case "$cmd[0]" in
-               tag*)
-                  TAGS=( $(herbstclient tag_status $monitor) ) 
-                  ;;
-               conky*)
-                  conky="${cmd[@]:1}"
-                  ;;
-               esac
-     done
-} 2> /dev/null |dzen2 -ta l -y 0 -x 0 -h 16 -w 1286 -fg $FG -bg $BG -fn $FONT &