diff --git a/zsh/zsh.d/00-options b/zsh/zsh.d/00-options
index c837672..0ce45e3 100644
--- a/zsh/zsh.d/00-options
+++ b/zsh/zsh.d/00-options
@@ -27,5 +27,4 @@ setopt AUTO_CD
 setopt AUTO_MENU
 setopt no_MENU_COMPLETE
 setopt AUTO_LIST
-
 #  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/20-complete b/zsh/zsh.d/20-complete
index 61bb38b..1d3a6d1 100644
--- a/zsh/zsh.d/20-complete
+++ b/zsh/zsh.d/20-complete
@@ -1,6 +1,6 @@
 #######################################################################################
 # Start autocomplete
-autoload -U compinit; compinit
+autoload -U compinit; compinit -u
 autoload -U compsys;
 compctl -g "*(-/)" + -g ".*(-/)" cd
 
diff --git a/zsh/zsh.d/30-prompt b/zsh/zsh.d/30-prompt
index 2a33e7e..a33e9cc 100644
--- a/zsh/zsh.d/30-prompt
+++ b/zsh/zsh.d/30-prompt
@@ -1,17 +1,29 @@
 #######################################################################################
-# Setup PROMPT
-if [ ${TERM[0,5]} = "xterm" ] || [ ${TERM} = "rxvt" ]; then
-  # We are on xterminal
-  W="%{]2;::: %n at %m in %. :::%}"
-  I="%{]1;%m::%.%}"
-  L="%B%K{blue}%F{white}@%m::%2~ %f%k
-%F{yellow}%#%f%b "
-  PS1="$W$I$L"
-  unset W I L
 
-else
-  # We are not on xterminal
-  PS1="%B[%l] %n@%m:%~ %#%b "
-fi
+# prompt_akel_setup() {
+    # precmd () {
 
+        # # Setup PROMPT
+        # if [ ${TERM[0,5]} = "xterm" ] || [ ${TERM} = "rxvt" ]; then
+            # # We are on xterminal
+            # W="%{]2;::: %n at %m in %. :::%}"
+            # I="%{]1;%m::%.%}"
+            # L="%B%K{blue}%F{white}@%m::%2~ %f%k
+# %F{yellow}%#%f%b "
+            # PS1="$W$I$L"
+            # unset W I L
+
+        # else
+            # # We are not on xterminal
+            # PS1="%B[%l] %n@%m:%~ %#%b "
+        # fi
+    # }
+
+    # preexec () { }
+
+# }
+
+# prompt_akel_setup
+autoload -U promptinit;promptinit
+prompt akel1
 #  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/zshfunctions/prompt_akel1_setup b/zsh/zsh.d/zshfunctions/prompt_akel1_setup
new file mode 100644
index 0000000..714a7b1
--- /dev/null
+++ b/zsh/zsh.d/zshfunctions/prompt_akel1_setup
@@ -0,0 +1,19 @@
+function prompt_akel1_setup {
+
+# Setup PROMPT
+if [ ${TERM[0,5]} = "xterm" ] || [ ${TERM} = "rxvt" ]; then
+    # We are on xterminal
+    W="%{]2;::: %n at %m in %. :::%}"
+    I="%{]1;%m::%.%}"
+    L="%B%K{blue}%F{white}@%m::%2~ %f%k
+%F{yellow}%#%f%b "
+    PS1="$W$I$L"
+    unset W I L
+
+else
+    # We are not on xterminal
+    PS1="%B[%l] %n@%m:%~ %#%b "
+fi
+}
+
+prompt_akel1_setup
diff --git a/zsh/zshrc b/zsh/zshrc
index 8596c91..cf5e693 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -11,6 +11,10 @@ LIBRARY="/etc/zsh.d"
 KERNLIB="${LIBRARY}/${KERNEL}"
 
 function loadRC {
+    if [ -d $1/zshfunctions ]; then
+        fpath=($1/zshfunctions $fpath)
+    fi
+
     if [ -d $1 ]; then
         # for zshFile in $1/*[^~]; do
         for zshFile in $1/*[^off\|~]; do