diff --git a/hybris.plugin.zsh b/hybris.plugin.zsh
index ec226d2..29b429e 100644
--- a/hybris.plugin.zsh
+++ b/hybris.plugin.zsh
@@ -1,36 +1,19 @@
 # bip at command end
 function precmd() {echo -n -e "\a"}
-# function preexec() {print -Pn "\e]0;\a"}
 
 # do not share history between terms...
 unsetopt share_history
 
-# SSH agent lives for 2 hours
-# zstyle :omz:plugins:ssh-agent lifetime 2h
-
-# Scripts files
-SCRIPT_DIR=$HOME/.scripts
-if [ -d $SCRIPT_DIR ]
-then
-    files=`ls $SCRIPT_DIR`
-    if [ "x$files" != "x" ]
-    then
-	for i in `ls --file-type $SCRIPT_DIR`
-	do
-            ALIAS=`echo $i | cut -d. -f1`
-            alias $ALIAS=$SCRIPT_DIR/$i
-	done
-   fi
-fi
-
 # Everyday aliases
-alias j=jump
-alias dnsfix="sudo service bind9 restart"
-alias open_ports="sudo netstat -tulpen 2> /dev/null | grep LISTEN"
-cless() {for a in $@; do colorize_via_pygmentize $a | less; done}
-r() {if [ $# -eq 1 ]; then ssh root@$1; else sudo su -; fi}
-health() {/usr/bin/screen -O -S health -c ~/.config/screen_health}
-loop() {while [ 1 ]; do sh -c "$@"; done}
+bthost()	{cat $INFRA/host/$1}
+cless()		{for a in $@; do colorize_via_pygmentize $a | less; done}
+e()		{emacsclient -n $@ > /dev/null 2>&1}
+health()	{/usr/bin/screen -O -S health -c ~/.config/screen_health}
+j()		{jump $@}
+loop()		{while [ 1 ]; do sh -c "$@"; done}
+open_ports()	{sudo netstat -tulpen 2> /dev/null | grep LISTEN"}
+r()		{if [ $# -eq 1 ]; then ssh root@$1; else sudo su -; fi}
+
 
 # Some exports
 export EDITOR=emacsclient
@@ -40,7 +23,7 @@ export INFRA=/home/hybris/dev/bearstech/bearstech/infra
 export LESS=-cex2MRX
 export LESSOPEN='|~/.lessfilter %s'
 export LOGCHECK=60
-export PATH=/usr/local/bin:$INFRA/bin:/home/hybris/dev/bearstech/bearstech/xen:$PATH
+export PATH=$INFRA/bin:$INFRA/../xen:$HOME/.scripts:$PATH
 export READNULLCMD=${PAGER:-/usr/bin/pager}
 export SAVEHIST=5000
 export WATCH=all