diff --git a/files/.config/nvim/mappings.vim b/files/.config/nvim/mappings.vim
index 176af63..67e6e79 100644
--- a/files/.config/nvim/mappings.vim
+++ b/files/.config/nvim/mappings.vim
@@ -80,6 +80,7 @@ nmap <silent> <leader>E :CocCommand explorer --reveal expand('<sfile>')<cr>
 
 
 " coc.nvim
+"   <l>c - Open command list
 "   Ctrl-n - Go to previous diagnostic
 "   Ctrl-p - Go to next diagnostic
 "   <l>d - Jump to definition of current symbol
@@ -97,6 +98,11 @@ nmap <silent> <leader>r <Plug>(coc-references)
 nmap <silent> <leader>j <Plug>(coc-implementation)
 nmap <silent> <leader>s :<C-u>CocList -I -N --top symbols<cr>
 nmap <silent> <leader>n <Plug>(coc-rename)
+nmap <silent> <leader>c :CocCommand<cr>
+
+" vimspector
+"   <l>D - Start debugger
+nmap <silent> <leader>D :call vimspector#Launch()<cr>
 
 
 " Search shorcuts
diff --git a/files/.config/nvim/plugins.vim b/files/.config/nvim/plugins.vim
index 5003ac3..0906cba 100644
--- a/files/.config/nvim/plugins.vim
+++ b/files/.config/nvim/plugins.vim
@@ -23,10 +23,10 @@ Plug 'vim-airline/vim-airline-themes'
     let g:airline_theme = 'base16_seti'
 
     " Enable extensions
-    let g:airline_extensions = ['branch', 'coc', 'hunks']
+    let g:airline_extensions = ['branch', 'coc', 'hunks', 'tabline', 'whitespace', 'fzf']
 
     " Do not draw separators for empty sections (only for the active window) >
-    let g:airline_skip_empty_sections = 1
+    let g:airline_skip_empty_sections = 0
 
     " Custom setup that removes filetype/whitespace from default vim airline bar
     let g:airline#extensions#default#layout = [['a', 'b', 'c'], ['x', 'z', 'warning', 'error']]
@@ -116,8 +116,8 @@ Plug 'tpope/vim-fugitive'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 " {{{
-    let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } }
-    let g:fzf_preview_window = ['right:66%', 'ctrl-/']
+    let g:fzf_layout = { 'down': '~40%' }
+    let g:fzf_preview_window = ['right:50%', 'ctrl-/']
     let g:fzf_buffers_jump = 1
 " }}}
 Plug 'antoinemadec/coc-fzf'
@@ -161,4 +161,13 @@ Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
         \ ]
 " }}}
 
+" debugger
+Plug 'puremourning/vimspector'
+" {{{
+    let g:vimspector_enable_mappings = 'HUMAN'
+" }}}
+
+" Terminal
+Plug 'kassio/neoterm'
+
 call plug#end()
diff --git a/files/.profile b/files/.profile
index 82eda0f..15dba21 100644
--- a/files/.profile
+++ b/files/.profile
@@ -60,7 +60,7 @@ export EDITOR="nvim"
 export VISUAL="nvim"
 
 # fzf
-export FZF_DEFAULT_OPTS="--reverse --margin=1,5%"
+export FZF_DEFAULT_OPTS="--reverse"
 export FZF_DEFAULT_COMMAND='fdfind --type f --hidden --follow --exclude .git'
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 export FZF_COMPLETION_TRIGGER='**'