diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index d028f6d..16763f0 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -19,13 +19,19 @@ call plug#begin('~/.vim/plugged')
 	Plug 'mileszs/ack.vim'
 	Plug 'ctrlpvim/ctrlp.vim'
   Plug 'moll/vim-node'
+  Plug 'pangloss/vim-javascript'
+  Plug '1995eaton/vim-better-javascript-completion'
   Plug 'heavenshell/vim-jsdoc',  {
     \ 'for': ['javascript', 'javascript.jsx','typescript'],
     \ 'do': 'make install'
     \}
+  Plug 'JamshedVesuna/vim-markdown-preview'
 " Initialize plugin system
 call plug#end()
 
+" -- Markdown preview
+let vim_markdown_preview_browser='Mozilla Firefox'
+
 " -- Display
 colorscheme nord
 set title
@@ -34,6 +40,10 @@ set ruler
 set wrap
 set scrolloff=5
 syntax enable
+set encoding=utf-8
+set fileencoding=utf-8
+set showmatch         " When a bracket is inserted, briefly jump to the matching one
+set cursorline        " Highlight the screen line of the cursor
 
 filetype on
 filetype plugin on
@@ -82,9 +92,10 @@ set hidden
 :map <C-x> <Esc>
 
 " Code formating
-set expandtab
-set tabstop=2
-set shiftwidth=2
+set smartindent       " Do smart autoindenting when starting a new line
+set tabstop=2         " Number of spaces that a <Tab> in the file counts for
+set shiftwidth=2      " Alignment with '<' and '>'
+set expandtab         " Use spaces instead of tab
 
 let b:ale_linters = ['eslint']
 let g:ale_fixers = {
@@ -98,3 +109,10 @@ augroup myTodo
   autocmd Syntax * syntax match myTodo /\v\_.<(TODO|FIXME|INFO).*/hs=s+1 containedin=.*Comment
 augroup END
 highlight link myTodo Todo
+
+" -- Plugins configurations
+
+" vim-javascript
+let g:javascript_plugin_jsdoc = 1 " Enables syntax highlighting for JSDocs
+let g:javascript_plugin_flow = 1  " Enables syntax highlighting for Flow
+