diff --git a/config/alacritty.yml b/config/alacritty.yml
index b12d1c4..2a4f669 100644
--- a/config/alacritty.yml
+++ b/config/alacritty.yml
@@ -12,16 +12,16 @@ font:
   hinting: true
   size: 12.0
   normal:
-    family: Hack 
+    family: JetBrains Mono
     style: Regular
   bold:
-    family: Hack
+    family: JetBrains Mono
     style: Bold
   italic:
-    family: Hack
+    family: JetBrains Mono
     style: Italic
   bold_italic:
-    family: Hack
+    family: JetBrains Mono
     style: Bold Italic
   offset:
     x: 1
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index b5e3fa6..1613c7d 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -9,13 +9,13 @@ Run() {
 }
 
 ## == Autostart
-setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" &
-Run sxhkd -c .config/bspwm/sxhkd &
+Run setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" &
+Run sxhkd -c ./.config/bspwm/sxhkd &
 ~/.config/bspwm/bar.sh &
 Run nitrogen --restore &
 ~/.script/autolock &
 Run lxsession &
-Run picom &
+Run picom -b &
 
 ## == BSPWM
 
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index 50e79aa..ab1eab1 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -12,9 +12,10 @@ call plug#begin('~/.vim/plugged')
   Plug 'editorconfig/editorconfig-vim'  " EditorConfig support
   Plug 'christoomey/vim-tmux-navigator' " Jump from vim to tmux and back
   Plug 'Xuyuanp/nerdtree-git-plugin'    " NERDTree git status
+  Plug 'preservim/nerdcommenter'        " Code commenter
 
   " Completion & snippets
-  "Plug 'ervandew/supertab'
+  Plug 'ervandew/supertab'
   Plug 'jiangmiao/auto-pairs'
   Plug 'SirVer/ultisnips'
   Plug 'mattn/emmet-vim', {'for': ['html', 'javascript']}
@@ -124,8 +125,17 @@ let g:lightline = {
 \   'linter_ok': 'lightline#ale#ok'
 \ },}
 
+" NERDTree
+nnoremap <C-b> :NERDTreeToggle<CR>
+let g:NERDTreeWinPos="right"
+let NERDTreeIgnore = ['__pycache__', '\**\*.sw[po]','.DS_Store']
+let NERDTreeMinimalUI=1
+let NERDTreeShowHidden=0
+let g:NERDTreeWinSize = 28
+
 " Emmet
-let g:user_emmet_expandabbr_key='<tab>'
+"let g:user_emmet_expandabbr_key='<tab>'
+let g:user_emmet_leader_key=','
 let g:user_emmet_mode='inv'
 
 " UltiSnipts