diff --git a/.gitignore b/.gitignore
index 2e8db7341..50396bda5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ custom/*
 !custom/example.zsh
 cache
 *.swp
+*~
diff --git a/README.textile b/README.textile
index bf6776665..276267e98 100644
--- a/README.textile
+++ b/README.textile
@@ -12,18 +12,18 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/zyce/oh-my-zsh/raw/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/zyce/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
 
 1. Clone the repository
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+  @git clone git://github.com/zyce/oh-my-zsh.git ~/.oh-my-zsh@
 
 2. Create a new zsh config by copying the zsh template we've provided.
 
diff --git a/lib/misc.zsh b/lib/misc.zsh
index 88732e664..8ef1f3f9f 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -1,6 +1,7 @@
 ## smart urls
-autoload -U url-quote-magic
-zle -N self-insert url-quote-magic
+if [ -f "/usr/share/zsh/functions/Zle/url-quote-magic" ] ; then
+    autoload -U url-quote-magic && zle -N self-insert url-quote-magic
+fi
 
 ## file rename magick
 bindkey "^[m" copy-prev-shell-word
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 221989502..777d8a64b 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -28,6 +28,10 @@ function omz_termsupport_preexec {
   title "$CMD" "%100>...>$2%<<"
 }
 
-autoload -U add-zsh-hook
-add-zsh-hook precmd  omz_termsupport_precmd
-add-zsh-hook preexec omz_termsupport_preexec
+#autoload -U add-zsh-hook
+#add-zsh-hook precmd  omz_termsupport_precmd
+#add-zsh-hook preexec omz_termsupport_preexec
+## Fix for zsh hook compatibility issues 
+if [ -f "/usr/share/zsh/functions/Zle/add-zsh-hook" ] ; then
+    autoload -U add-zsh-hook && add-zsh-hook precmd omz_termsupport_precmd && add-zsh-hook preexec omz_termsupport_preexec
+fi
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e52553241..fe20ba51a 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -5,11 +5,11 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="robbyrussell"
+ZSH_THEME="juanghurtado"
 
 # Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
+alias zshconfig="nano ~/.zshrc"
+alias ohmyzsh="nano ~/.oh-my-zsh"
 
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"