diff --git a/hybris.completions b/hybris.completions
index b2a534d..5805df3 100644
--- a/hybris.completions
+++ b/hybris.completions
@@ -4,3 +4,12 @@ compdef    _path_commands    catwhich
 
 _complete_tramp()     {reply=($(ls $INFRA/host && grep "^    [^ ]" ~/dev/robespierre/infra/hosts/all.yml | sed 's/^ *\(.*\):$/\1/'))}
 compctl -K _complete_tramp    tramp
+
+function _myssh(){
+  # Add bearstech hosts
+  compadd $(ls $INFRA/host)
+  # Add own hosts
+  compadd $(cat ~/dev/robespierre/infra/hosts/all.yml | grep "^    [^ ]" | sed 's/ *\(.*\):/\1/')
+}
+compdef _myssh r
+compdef _myssh ra
\ No newline at end of file
diff --git a/hybris.zsh b/hybris.zsh
index a121d79..28fe5bd 100644
--- a/hybris.zsh
+++ b/hybris.zsh
@@ -1,12 +1,11 @@
 # keychain
 zstyle :omz:plugins:keychain agents gpg,ssh
-zstyle :omz:plugins:keychain identities id_rsa D79CA887
+zstyle :omz:plugins:keychain identities id_rsa id_ed25519 D79CA887
 zstyle :omz:plugins:keychain options --quiet
 
 # bip at command end, resize font
 function precmd() {
     echo -n -e "\a"
-#    [ -n "${DISPLAY}" ] && /home/hybris/.scripts/term-fontsize
 }
 
 # history file
@@ -18,8 +17,6 @@ SAVEHIST=500000
 
 # Everyday aliases
 catwhich()       {echo "\e[35mPath: $(which $1)\n\e[39m"; cat $(which $1)}
-colorixe()       {for a in $@; do ccat $a | less; done}
-dchroot()        {docker run --rm --privileged -ti $@ debian:stretch /bin/bash}
 dontknow()       {echo -n "¯\\_(ツ)_/¯" | xclip}
 dualscreen()     {[ $# -eq 1 ] && xrandr --auto && xrandr --output $1 --primary --output eDP1 --left-of $1}
 e()              {emacsclient -n $@ > /dev/null 2>&1}