diff --git a/.gitignore b/.gitignore
index fd58b0e..a93bd8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /zsh.conf
+/custom
 
diff --git a/completion b/completion
deleted file mode 100644
index e69de29..0000000
diff --git a/example_configs/zsh.conf b/example_configs/zsh.conf
index 5a3d980..2dddf62 100644
--- a/example_configs/zsh.conf
+++ b/example_configs/zsh.conf
@@ -1,9 +1,11 @@
 # ZSH Configuration
 BSD_MODE=false			#Some options must be specified differently in BSD
 SYNTAX_HIGHLIGHT=true		#On-the-fly syntax highlighting of commands that you type
+AUTO_CD=true			#When true, if only a directory path is entered, you will cd to the directory
 
 # Prompt Style
 PROMPT_STYLE=bsd		#Valid options: bsd, bsd2, ar5
+COMPLETION_STYLE=bash		#ZSH "automenu" option toggle - Valid options: bash, zsh (defaults to bash)
 
 # Example prompts:
 # bsd: user@host:~/storage/git[git-branch]%
diff --git a/setopt b/setopt
index beb35e6..a45f54c 100644
--- a/setopt
+++ b/setopt
@@ -2,10 +2,14 @@ autoload -U compinit promptinit
 autoload -U colors && colors
 compinit -d ${HOME}/.cache/.zcompdump
 promptinit
-setopt autocd
+if [ $AUTO_CD = true ]
+then
+  setopt autocd
+fi
 unsetopt beep
 setopt HIST_IGNORE_SPACE
-
-## BASH-style completion; comment out for full ZSH completion.
-setopt noautomenu
+if [ $COMPLETION_STYLE = bash ]
+then
+  setopt noautomenu
+fi
 
diff --git a/zshrc b/zshrc
index 4d7af36..9845f1d 100644
--- a/zshrc
+++ b/zshrc
@@ -7,7 +7,6 @@ else
   source $HOME/.zsh/interactive
   source $HOME/.zsh/exports
   source $HOME/.zsh/bindkeys
-  source $HOME/.zsh/completion
   source $HOME/.zsh/setopt
   PROMPT="UNCONFIGURED%# "
   return 1
@@ -17,7 +16,6 @@ source $HOME/.zsh/alias
 source $HOME/.zsh/interactive
 source $HOME/.zsh/exports
 source $HOME/.zsh/bindkeys
-source $HOME/.zsh/completion
 source $HOME/.zsh/setopt
 if [ $SYNTAX_HIGHLIGHT = true ]
 then