diff --git a/vim/.vim/colors/madtheme.vim b/vim/.vim/colors/madtheme.vim
index c1a6b8b..c7e3cb2 100644
--- a/vim/.vim/colors/madtheme.vim
+++ b/vim/.vim/colors/madtheme.vim
@@ -58,12 +58,14 @@ hi Ignore     	 cterm=bold ctermfg=darkgrey
 hi Error      	 cterm=bold ctermbg=red
 hi Todo          cterm=bold,underline ctermbg=none ctermfg=darkgrey
 
-" EasyMotion
-hi EasyMotionTarget cterm=none ctermbg=darkblue ctermfg=black
-hi EasyMotionShade cterm=none ctermbg=none ctermfg=grey
-hi EasyMotionMoveHL cterm=none ctermbg=none ctermfg=darkblue
-hi EasyMotionTarget2First ctermbg=none ctermfg=red
-hi EasyMotionTarget2Second ctermbg=none ctermfg=lightred
+"    EasyMotion
+hi   EasyMotionTarget          cterm=none   ctermbg=none   ctermfg=lightblue
+hi   EasyMotionShade           cterm=none   ctermbg=none   ctermfg=grey
+hi   EasyMotionMoveHL          cterm=none   ctermbg=none   ctermfg=blue
+hi   EasyMotionTarget2First    cterm=none   ctermbg=none   ctermfg=blue
+hi   EasyMotionTarget2Second   cterm=none   ctermbg=none   ctermfg=blue
+hi   EasyMotionIncSearch       cterm=none ctermbg=none ctermfg=lightblue
+hi   EasyMotionIncCursor       cterm=none ctermbg=none ctermfg=lightblue
 
 " ModeLine
 hi ModeLineNormal cterm=none ctermbg=none ctermfg=none
diff --git a/vim/.vimrc b/vim/.vimrc
index f04d491..722fc7a 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -156,23 +156,35 @@ nnoremap <silent> <leader>i      :set list!<cr>
 nnoremap <leader>rr :call RunCmdVimux()<cr>
 nnoremap <leader>rq :call VimuxCloseRunner()<cr>
 nnoremap <silent> ; :call AddSemicolon()<cr>
-nnoremap <silent> <leader>todo :g/TODO/<cr>
+nnoremap <silent> <leader>t :g/TODO/<cr>
 " 0 should find first non blank
 nmap 0 ^
 " Easy buffer switching
-nnoremap <silent> <C-m> :bnext<cr>
-nnoremap <silent> <C-n> :bprev<cr>
+nnoremap <silent> M :bnext<cr>
+nnoremap <silent> N :bprev<cr>
 " Moving through windows
 nnoremap <C-l> <C-w>l
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k
 " Quick macroing
-nnoremap + @wj
+nnoremap Q @@
 " --- Don't need a help
 inoremap <F1> <nop>
 nnoremap <F1> <nop>
 vnoremap <F1> <nop>
+" -- Make Y behave correct
+map Y y$
+" -- Easy indenting in visual
+vnoremap > >gv
+vnoremap < <gv
+" -- No need to jump around if i press (){}[]
+nmap ( <Nop>
+nmap ) <Nop>
+nmap { <Nop>
+nmap } <Nop>
+nmap [ <Nop>
+nmap ] <Nop>
 
 " Sudo to write
 cnoremap w!! w !sudo tee % >/dev/null
@@ -186,7 +198,6 @@ ino <up> <Nop>
 ino <left> <Nop>
 ino <right> <Nop>
 
-
 " --- Different use of undo
 nnoremap U <c-r>