diff --git a/.zshrc b/.zshrc
index 10e919e..bc74acd 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,6 +5,10 @@ export DOTFILES=~/.dotfiles
 # Autocompletion
 export FPATH=$DOTFILES/zsh/functions:$FPATH
 
+# Base autoloading
+autoload -Uz compaudit compinit vcs_info
+compinit
+
 # zsh packages from system
 if uname -a | grep -qi 'debian'; then
   # Options for debian
@@ -32,7 +36,7 @@ elif uname -a | grep -qi '\(arch\|manjaro\)'; then
 fi
 
 # Plugins
-for plugin in `find $DOTFILES -type f -iname \*.plugin.zsh -print`; do
+for plugin in `find $DOTFILES/zsh/plugin -type f -iname \*.plugin.zsh -print`; do
   source $plugin
 done
 
@@ -46,4 +50,6 @@ export FZF_DEFAULT_OPTS="--multi --no-mouse --ansi --color=dark"
 [ -f /etc/profile.d/rvm.sh ] && source /etc/profile.d/rvm.sh
 
 # Loading additional aliases
-source ~/.dotfiles/zsh/aliases/*.aliases.zsh
+for aliases in `find $DOTFILES/zsh/aliases -type f -iname \*.aliases.zsh`; then
+  source $aliases
+done
diff --git a/zsh/debian.base.zsh b/zsh/debian.base.zsh
new file mode 100644
index 0000000..5d6ad28
--- /dev/null
+++ b/zsh/debian.base.zsh
@@ -0,0 +1,38 @@
+zstyle ':vcs_info:*' enable git svn
+setopt prompt_subst # Prompting
+setopt correct #  Auto correct mistakes
+setopt extendedglob # allows regexp with *
+setopt nocaseglob # Case insensitive globbing
+setopt rcexpandparam # array expansion with parameters
+setopt nocheckjobs # No warn about running processes on exiting
+setopt nobeep
+setopt appendhistory
+setopt histignorealldups
+setopt autocd
+setopt inc_append_history
+setopt histignorespace # Ignore putting in history commands beginning with a space
+
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Zaz}' # Case insensitive completion
+zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}" # Color completion
+zstyle ':completion:*' rehash true # automatically updates new paths
+# Speed completion
+zstyle ':completion:*' accept-exact '*(N)'
+zstyle ':completion:*' use-cache on
+zstyle ':completion:*' cache-path ~/.zsh/cache
+
+# History
+HISTFILE=~/.zhistory
+HISTSIZE=10000
+SAVEHIST=10000
+WORDCHARS=${WORDCHARS//\/[&.;]}
+
+# Color man pages
+export LESS_TERMCAP_mb=$'\E[01;32m'
+export LESS_TERMCAP_md=$'\E[01;32m'
+export LESS_TERMCAP_me=$'\E[0m'
+export LESS_TERMCAP_se=$'\E[0m'
+export LESS_TERMCAP_so=$'\E[01;47;34m'
+export LESS_TERMCAP_ue=$'\E[0m'
+export LESS_TERMCAP_us=$'\E[01;36m'
+export LESS=-R
+