diff --git a/common/.config/ideavim/ideavimrc b/common/.config/ideavim/ideavimrc
index 215a1d6..d2db3fa 100644
--- a/common/.config/ideavim/ideavimrc
+++ b/common/.config/ideavim/ideavimrc
@@ -47,16 +47,16 @@ set clipboard^=unnamed,unnamedplus,ideaput " Copy to and from system clipboard
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Enabled plugins
-set ideajoin
-Plug 'easymotion/vim-easymotion'        " <leader>j or J [2 characters]
-Plug 'preservim/nerdtree'               " <leader>e
-Plug 'tpope/vim-surround'               " ys or cs or ds [motion]
-Plug 'tpope/vim-commentary'             " gc [motion]
-Plug 'machakann/vim-highlightedyank'
-Plug 'dbakker/vim-paragraph-motion'
-Plug 'chrisbra/matchit'
-Plug 'tpope/vim-repeat'                 " Repeat for Surround
-" Plug 'terryma/vim-multiple-cursors'     " mc (selects), mx (skips), mp (previous)
+set ideajoin quickscope
+Plug "easymotion/vim-easymotion"        " <leader>j or J [2 characters]
+Plug "preservim/nerdtree"               " <leader>e
+Plug "tpope/vim-surround"               " ys or cs or ds [motion]
+Plug "tpope/vim-commentary"             " gc [motion]
+Plug "machakann/vim-highlightedyank"
+Plug "dbakker/vim-paragraph-motion"
+Plug "chrisbra/matchit"
+Plug "tpope/vim-repeat"                 " Repeat for Surround
+Plug "vim-indent-object"                " Select indent with ai, ii, aI, iI
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 " Map <leader>d to start debug
diff --git a/common/.vim/key_maps.vim b/common/.vim/key_maps.vim
index 8d69011..5147d8c 100644
--- a/common/.vim/key_maps.vim
+++ b/common/.vim/key_maps.vim
@@ -94,8 +94,11 @@ inoremap <M-l> <Right>
 inoremap <M-j> <Down>
 inoremap <M-k> <Up>
 
-" Ctrl+Backspace to add an undo-point and delete last word
-imap <C-BS> <C-W><C-g>u
+" Move Lines with Alt+j,k
+nnoremap <M-j> :m .+1<cr>==
+nnoremap <M-k> :m .-2<cr>==
+vnoremap <M-j> :m '>+1<cr>gv=gv
+vnoremap <M-k> :m '<-2<cr>gv=gv
 
 " Insert mode: add undo points on "," & "." & ";"
 imap , ,<C-g>u
diff --git a/common/.vim/vimrc b/common/.vim/vimrc
index 499ca52..de5b264 100644
--- a/common/.vim/vimrc
+++ b/common/.vim/vimrc
@@ -32,6 +32,7 @@ colorscheme deep-space
 " VIM SPECIFIC CONFIG
 "
 """"""""""""""""""""""""""""""""
+
 " Move the .viminfo file inside .vim directory
 set viminfofile=$VIMDIR/viminfo
 
@@ -41,10 +42,11 @@ autocmd! bufwritepost $VIMRC source %
 " Save inside vim config directory
 set undodir=$VIMDIR/undo//
 
+" Ctrl+Backspace to add an undo-point and delete last word
+" It's here cause ideavim messes it up
+imap <C-BS> <C-g>u<C-w>
+
 " Map nerdtree to <Leader>e
 " Changes the pwd and opens the VCS root
+" Placed here because ideavim doesn't understand :tcd
 nnoremap <leader>e :tcd %:h<CR> :NERDTreeToggleVCS<CR>
-
-" NERDTree Plugin configurations
-let g:NERDTreeShowHidden = 1
-let g:NERDTreeWinSize = 25