diff --git a/.vimrc b/.vimrc
index 4df99e4..c4e5057 100644
--- a/.vimrc
+++ b/.vimrc
@@ -23,6 +23,7 @@ Bundle 'Lokaltog/vim-easymotion'
 Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
 Bundle 'tpope/vim-rails.git'
 Bundle 'https://github.com/fholgado/minibufexpl.vim'
+Bundle 'https://github.com/juvenn/mustache.vim'
 " vim-scripts repos
 Bundle 'L9'
 Bundle 'FuzzyFinder'
@@ -41,6 +42,23 @@ filetype plugin indent on     " required!
 " see :h vundle for more details or wiki for FAQ
 " NOTE: comments after Bundle command are not allowed..
 " *** End Vundle ***
+
+" Setup 256 colors
+if &term =~ "xterm"
+  "256 color --
+  let &t_Co=256
+  " restore screen after quitting
+  set t_ti=ESC7ESC[rESC[?47h t_te=ESC[?47lESC8
+  if has("terminfo")
+    let &t_Sf="\ESC[3%p1%dm"
+    let &t_Sb="\ESC[4%p1%dm"
+  else
+    let &t_Sf="\ESC[3%dm"
+    let &t_Sb="\ESC[4%dm"
+  endif
+endif
+
+
 set t_Co=256
 
 filetype on