diff --git a/init.vim b/init.vim
index e3ad2e3..3301df2 100644
--- a/init.vim
+++ b/init.vim
@@ -11,6 +11,8 @@ let $MYVIMDIR=split(&rtp, ',')[0]
 set exrc
 
 set background=dark
+let g:chroma_italic_style="bold"
+let g:chroma_nontext_dark=1
 colo chroma
 
 if exists("&cc")
@@ -27,7 +29,7 @@ set whichwrap+=<,>,h,l
 
 set notimeout
 set ttimeout
-set timeoutlen=50
+set ttimeoutlen=50
 
 set foldmethod=syntax
 
@@ -37,8 +39,6 @@ set vb t_vb=
 set shellcmdflag=-c
 set shell=/bin/zsh
 
-
-set timeoutlen=500
 set modeline
 set showcmd
 
@@ -157,26 +157,16 @@ inoremap <C-Space> <C-x><C-o>
 nmap <C-L>         :noh<cr>:redraw!<cr>
 
 nmap <F9>	   :make<CR>
-nmap <silent> <F11> :TagbarToggle<cr>
-nmap <silent> <Insert> :TagbarToggle<CR>
 nmap <leader>m  :make<CR>
 
 nmap <C-Tab> <C-w><C-w>
 imap <C-Tab> <esc><C-w><C-w>
 
-vmap <silent> gs :sort<cr>
+vmap <silent> gs :'<,'>sort<cr>
 
 "}}}
 
 
-" Denite {{{
-
-"call denite#custom#source('file_rec', 'matchers', ['matcher_cpsm'])
-"map <silent> gb :<C-u>Denite -buffer-name=buffers buffer<cr>
-"map <silent> gf :<C-u>Denite -buffer-name=files file_rec<cr>
-
-" }}}
-
 "Git {{{
 nmap <Leader>gu         :GitPush<CR>
 nmap <Leader>gvc        :!git svn dcommit<CR>
diff --git a/packages.vim b/packages.vim
index 24029aa..21156a1 100644
--- a/packages.vim
+++ b/packages.vim
@@ -57,8 +57,7 @@ Plug 'derekwyatt/vim-fswitch'
 
 
 "Scala
-Plug 'crater2150/vim-scala', { 'branch': 'indent-fix' }
-Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
+Plug 'derekwyatt/vim-scala'
 
 " Rust
 Plug 'racer-rust/vim-racer'
@@ -76,6 +75,8 @@ Plug 'elzr/vim-json'
 Plug 'kchmck/vim-coffee-script'
 Plug 'gre/play2vim'
 Plug 'isobit/vim-caddyfile'
+Plug 'vim-pandoc/vim-pandoc'
+Plug 'vim-pandoc/vim-pandoc-syntax'
 
 function! BuildComposer(info)
   if a:info.status != 'unchanged' || a:info.force