diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index f48fb04..914354c 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -94,7 +94,7 @@ bind-key c new-window -c "#{pane_current_path}"
 bind-key -n S-down new-window
 bind-key -n S-left prev
 bind-key -n S-right next
-bind-key -n C-j detach
+bind-key -n C-q detach
 
 bind-key -n C-F1 command-prompt "split-window -h 'exec man %%'"
 bind-key -n C-F2 split-window -h "exec htop"
diff --git a/vim/vimrc b/vim/vimrc
index 98d4c69..8f7ec9e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -17,6 +17,7 @@ Plugin 'nblock/vim-dokuwiki'
 Plugin 'reedes/vim-pencil'
 Plugin 'saltstack/salt-vim'
 Plugin 'sickill/vim-monokai'
+Plugin 'sjl/gundo.vim'
 Plugin 'tpope/vim-commentary'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-speeddating'
@@ -45,7 +46,7 @@ filetype plugin indent on
 
 set t_Co=256
 
-" == tabs / spaces / indent ==
+" == formatting ==
 set tabstop=4
 set smarttab
 set softtabstop=4
@@ -54,6 +55,7 @@ set shiftwidth=4
 set autoindent
 set expandtab
 set smartindent
+set formatoptions=tcroqnj
 
 " == ui ==
 set cursorline
@@ -128,7 +130,7 @@ set hidden
 " == editing ==
 set backspace=indent,eol,start
 set esckeys
-set matchpairs="(:),{:},[:],<:>"
+set matchpairs=(:),{:},[:],<:>
 set notimeout
 set ttimeout
 set timeoutlen=1000
@@ -171,11 +173,15 @@ nnoremap <C-l> <C-w>l
 nmap <C-n> :bnext<CR>
 nmap <C-p> :bprev<CR>
 
+map N Nzz
+map n nzz
+
 inoremap jj <ESC>
 
 nnoremap <leader>v <C-w>v<C-w>l
 
-nmap ; :CtrlPBuffer<CR>
+nnoremap <leader>u :GundoToggle<CR>
+
 
 " no more ex mode
 nnoremap Q <nop>