diff --git a/colors.vim b/colors.vim
index 4d3ead7..26c31d3 100644
--- a/colors.vim
+++ b/colors.vim
@@ -1,4 +1,7 @@
+" 16 colors only
 set t_Co=16
+
+" Code
 highlight Cursor      ctermfg=14
 highlight Keyword     ctermfg=06
 highlight Define      ctermfg=06
@@ -12,5 +15,10 @@ highlight Include     ctermfg=06
 highlight Statement   ctermfg=06
 highlight String      ctermfg=03
 highlight Search      ctermbg=14
+
+" Editor UI
+highlight NonText     ctermfg=00
+highlight VertSplit   ctermfg=08 cterm=none
 highlight LineNr      ctermfg=08
-highlight NonText     ctermfg=00
\ No newline at end of file
+
+set fillchars+=vert:│
diff --git a/vimrc b/vimrc
index 9f7f9e9..0fd972a 100644
--- a/vimrc
+++ b/vimrc
@@ -13,10 +13,32 @@ let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc"
 set tags=$XDG_CACHE_HOME/vim/tags
 
 " Keep history
-set undodir=$XDG_CACHE_HOME/vim/undo
+set undodir=$XDG_:CACHE_HOME/vim/undo
 set undofile
 
 
+""
+"" Plugins
+""
+
+set rtp+=$XDG_CACHE_HOME/vim/plugins/Vundle.vim
+call vundle#begin('$XDG_CACHE_HOME/vim/plugins')
+
+Plugin 'VundleVim/Vundle.vim'
+Plugin 'kien/ctrlp.vim'
+Plugin 'itchyny/lightline.vim'
+Plugin 'townk/vim-autoclose'
+Plugin 'tpope/vim-fugitive'
+Plugin 'travitch/hasksyn'
+Plugin 'tpope/vim-markdown'
+Plugin 'jgertm/nix.vim'
+Plugin 'ervandew/supertab'
+Plugin 'majutsushi/tagbar'
+Plugin 'scrooloose/syntastic'
+
+call vundle#end()
+
+
 ""
 "" Options
 ""
@@ -49,6 +71,7 @@ set ffs=unix                            " Use UNIX file format
 set clipboard=unnamed                   " Clipboard integration
 set ttyfast                             " Improve redrawing in xterm
 filetype indent plugin on               " Identify file type
+filetype on                             "
 set wildignore+=*/tmp/*,*.so,*.swp      " Files to ignore
 
 set shiftwidth=4                        " Tab
@@ -71,6 +94,7 @@ set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)
 ""
 "" Key bindings
 ""
+let mapleader=","
 
 " Windows navigation
 map <C-k> <C-w><Up>
@@ -78,30 +102,8 @@ map <C-j> <C-w><Down>
 map <C-l> <C-w><Right>
 map <C-h> <C-w><Left>
 
-map <C-t> :TagbarToggle<CR>
-
-
-""
-"" Plugins
-""
-
-set rtp+=$XDG_CACHE_HOME/vim/plugins/Vundle.vim
-call vundle#begin('$XDG_CACHE_HOME/vim/plugins')
-
-Plugin 'VundleVim/Vundle.vim'
-Plugin 'kien/ctrlp.vim'
-Plugin 'itchyny/lightline.vim'
-Plugin 'townk/vim-autoclose'
-Plugin 'tpope/vim-fugitive'
-Plugin 'travitch/hasksyn'
-Plugin 'tpope/vim-markdown'
-Plugin 'jgertm/nix.vim'
-Plugin 'ervandew/supertab'
-Plugin 'majutsushi/tagbar'
-Plugin 'scrooloose/syntastic'
-
-call vundle#end()
-
+map <Leader>t :TagbarToggle<CR>
+inoremap jj <ESC>
 
 ""
 "" Plugin options