diff --git a/zsh.d/20-complete.zsh b/zsh.d/20-complete.zsh
index 4f89f4c..8379543 100644
--- a/zsh.d/20-complete.zsh
+++ b/zsh.d/20-complete.zsh
@@ -9,7 +9,7 @@ done
 
 compinit -C
 
-# autoload bashcompinit && bashcompinit
+autoload bashcompinit && bashcompinit
 # autoload bashcompinit
 
 # allow approximate
diff --git a/zsh.d/20-termcolors.zsh.off b/zsh.d/20-termcolors.zsh
similarity index 100%
rename from zsh.d/20-termcolors.zsh.off
rename to zsh.d/20-termcolors.zsh
diff --git a/zsh.d/60-hooks.zsh.off b/zsh.d/60-hooks.zsh.off
deleted file mode 100644
index 2e55725..0000000
--- a/zsh.d/60-hooks.zsh.off
+++ /dev/null
@@ -1,30 +0,0 @@
-# Hooks for zsh
-#
-# - precmd
-# - chpwd
-# - preexec
-# - periodic
-# - zshaddhistory
-# - zshexit
-#
-
-# Async Git update
-autoload -Uz vcs_info
-
-_vbe_vcs_info_done() {
-  local stdout=$3
-  vcs_info_msg_0_=$stdout
-	# echo $(date +"%Y-%m-%d %H:%M:%S") $PWD info $vcs_info_msg_0_  $vcs_info_msg_1_ >> ~/vcs.log
-  zle reset-prompt
-}
-
-_vbe_vcs_precmd() {
-  # echo $(date +"%Y-%m-%d %H:%M:%S") $PWD pre >> ~/vcs.log
-  async_flush_jobs vcs_info
-  async_job vcs_info _vbe_vcs_info $PWD
-}
-
-async_init
-async_start_worker vcs_info
-async_register_callback vcs_info _vbe_vcs_info_done
-add-zsh-hook precmd _vbe_vcs_precmd
diff --git a/zshrc b/zshrc
index 9bb7bf5..5a0463e 100644
--- a/zshrc
+++ b/zshrc
@@ -12,34 +12,31 @@
 # profiling data at startup
 zmodload zsh/zprof
 
-function loadRC {
-  [ -d $1/zshfunctions ] && fpath=($1/zshfunctions $fpath)
-  [ -d $1/completions ] && fpath=($1/completions $fpath)
-
-  for zshFile in $1/[0-9]*.zsh; do
-    source $zshFile
-  done
-}
-
 # Default PATH
 PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$HOME/bin"
 
+# Determine zsh conf file position.
 local BASE="/etc"
-# Determine zsh conf file position. On Debian/Ubuntu is /etc/zsh, on other should be /etc
+
+# On Debian/Ubuntu is /etc/zsh, on other should be /etc
 [ -d /etc/zsh ] && BASE="/etc/zsh"
 
 # If there is a .zsh directory into user's home, use that one instead (local install)
 [ -d ~/.zsh ] && BASE=~/.zsh
 
 
-local KERNEL=`uname -s`
 local LIBRARY=${BASE}/zsh.d
-local KERNLIB=${LIBRARY}/${KERNEL}
+# local KERNEL=`uname -s`
+local KERNLIB=${LIBRARY}/$(uname -s)
 
-loadRC ${KERNLIB}
-loadRC ${LIBRARY}
+# loadRC ${LIBRARY} ${KERNLIB}
+for subdir in $LIBRARY $KERNLIB; do
+  [ -d $subdir/zshfunctions ] && fsubdir=($subdir/zshfunctions $fsubdir)
+  [ -d $subdir/completions ] && fsubdir=($subdir/completions $fsubdir)
+
+  for zshFile in $subdir/[0-9]*.zsh; do
+    # echo $zshFile
+    source $zshFile
+  done
+done
 
-# # Add local customization file
-# if [ -w $LIBRARY ]; then
-#   [ -f $LIBRARY/99-local.zsh ] || echo "# Local customizations" > $LIBRARY/99-local.zsh
-# fi