diff --git a/.vimrc b/.vimrc
index a73b88f..85dcb96 100644
--- a/.vimrc
+++ b/.vimrc
@@ -31,9 +31,6 @@ if has('nvim')
 	autocmd FileType typescript nnoremap <buffer> <C-]> :TSDef<CR>
 	autocmd FileType typescript nnoremap <buffer> <Leader>t :TSType<CR>
 	autocmd FileType typescript nnoremap <buffer> <Leader>d :TSDoc<CR>
-
-	" Scala
-	Plug 'buntec/neovim-scalavista', { 'do': ':UpdateRemotePlugins' }
 else
 	Plug 'Quramy/tsuquyomi'
 	Plug 'leafgarland/typescript-vim'
@@ -132,3 +129,6 @@ if !empty($LC_LIGHT_BG)
 	set background=light
 	let g:airline_theme='light'
 endif
+
+" markdown
+let g:markdown_fenced_languages = ['html', 'python', 'bash=sh', 'scala', 'typescript', 'javascript']
diff --git a/.zshrc b/.zshrc
index 560d4a5..ec3ef88 100644
--- a/.zshrc
+++ b/.zshrc
@@ -9,14 +9,13 @@ else
 fi
 
 export PATH=$PATH:~/bin
-export EDITOR=vim
+export EDITOR=nvim
 export CLICOLOR=1
 
 export MAIL=/var/spool/mail/amgutier
 
 export LSCOLORS=DxGxcxdxCxegedabagacad
-export LESSOPEN='|/usr/local/bin/lesspipe.sh %s'
-export LESS_ADVANCED_PREPROCESSOR=1
+export LESSOPEN="|/usr/local/bin/lesspipe.sh %s" LESS_ADVANCED_PREPROCESSOR=1
 
 setopt PROMPT_SUBST ;
 # for git-prompt
@@ -30,24 +29,16 @@ PS1=$'\n╭%{$fg[yellow]%}$(__git_ps1 "(%s)")%{$fg[green]%}[%~]%{$reset_color%}\
 # set window title to working directory
 precmd () { print -Pn "\e]0;%~\a" }
 
-alias cdg='. cdg'
 alias coin='rlwrap coin' # by-setup-c0
 alias dark='export LC_LIGHT_BG='
 alias ed='ed -p:'
-alias fuck='sudo $(history -p \!\!)'
 alias grep='grep --color=auto'
-alias hidden='ls -a | grep "^\..*"'
-alias killz='killall -9 '
 alias light='export LC_LIGHT_BG=1'
 alias m='ncmpcpp'
-alias math='rlwrap MathKernel'
 alias ocaml='rlwrap ocaml'
 alias ocamldebug='rlwrap ocamldebug'
 alias rm='rm -i'
-alias shell='ps -p $$ -o comm='
 alias sml='rlwrap sml'
-alias sshp='ssh -o PubkeyAuthentication=no'
-alias style='clang-format-3.5 -style=Google'
 alias telnet='rlwrap telnet'
 
 # Enable color support of ls and also add handy aliases