diff --git a/lib/install.sh b/lib/install.sh
deleted file mode 100644
index f9e804f..0000000
--- a/lib/install.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-setup_myzsh() {
-    rm -f ~/.zcompdump; compinit
-}
diff --git a/my.zsh b/my.zsh
index 74e6e22..b6d369b 100644
--- a/my.zsh
+++ b/my.zsh
@@ -16,11 +16,28 @@
 #    with this program; if not, write to the Free Software Foundation, Inc.,
 #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 # -----------------------------------------------------------------------------
+# Set options
+export HISTFILE=$HOME/.zsh_history
+export HISTFILESIZE=500
+export SAVEHIST=500
+export HISTSIZE=500
+
+setopt HIST_IGNORE_DUPS
+setopt NO_HIST_BEEP
+setopt PROMPT_SUBST
+setopt NO_BEEP
+setopt AUTO_CD
+setopt CORRECT
+setopt SHARE_HISTORY
+setopt HIST_IGNORE_ALL_DUPS
+
+current_path=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
+#current_file=$current_path/$(basename -- "$0")
+export my_zsh_plugin_dir="$current_path/plugins"
+
+# My.Zsh directory path
+myzsh=${MYZSH:-$HOME}
 
-# current_path=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
-current_path=$ZSH_CUSTOM
-myzsh=$ZSH_CUSTOM
-current_file=$current_path/$(basename -- "$0")
 
 fpath=($myzsh/lib/functions/{*.zsh,*.zwc}(N) $fpath)
 
@@ -32,5 +49,11 @@ done
 # Load aliases
 . $myzsh/aliases
 
+# Load the theme and coloring
+autoload -U colors && colors
+
+theme=${THEME:-$myzsh/themes/lxsameer.zsh-theme}
+. $theme
+
 project_path=${PROJECTS:-~/src}
 cdpath=($project_path $cdpath)
diff --git a/zshrc.sample b/zshrc.sample
index 1a97ed9..d237b2b 100644
--- a/zshrc.sample
+++ b/zshrc.sample
@@ -1,13 +1,12 @@
-MYZSH=$HOME/src/My.Zsh
-
+MYZSH=$HOME/.my.zsh
 THEME=$MYZSH/themes/lxsameer.zsh-theme
-
-# Example aliases
-alias emacsw="emacs -nw"
-
 source $MYZSH/my.zsh
+
 PROJECTS=$HOME/src/
 eval $(keychain --eval --agents ssh -Q --quiet id_rsa)
 
-export PATH=/home/lxsameer/.gem/ruby/2.0.0/bin:$PATH
-export GEM_HOME=~/.gem/
+# All of your configuration goes this file
+load_overrides ~/.zshrc.override
+
+setup_highlighting
+setup_autosuggestion