diff --git a/tmux.conf b/tmux.conf
index 1ec93b4..0e88e4a 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -2,6 +2,7 @@ setw -g automatic-rename
 
 set-option -g default-shell /bin/zsh
 set -g default-command "reattach-to-user-namespace -l ${SHELL}"
+set -g default-terminal "screen-256color"
 
 set -g prefix C-a
 unbind C-b
diff --git a/vimrc b/vimrc
index 2e5cd00..4a606d1 100644
--- a/vimrc
+++ b/vimrc
@@ -7,16 +7,55 @@ syntax on
 " built-in plugin, `%` to jump to condition branch
 runtime macros/matchit.vim
 
+let mapleader=" "
+
 set autoindent
 set backspace=indent,eol,start
-set hidden  " have more than one unsaved buffer
+set hidden
 set incsearch
-set ruler  " show position in bottom-right
+set ruler
 set wildmenu
+set number
+set list
+set listchars=tab:▸\ ,extends:>,precedes:<,trail:~
+set cursorline
+set colorcolumn=80
+set backup
+set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp
+set backupskip=/tmp/*,/private/tmp/*
+set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp
+set writebackup
+set expandtab
+
+nmap <leader>j :bnext<CR>
+nmap <leader>k :bprevious<CR>
 
 call plug#begin('~/.vim/plugged')
-  Plug 'sheerun/vim-polyglot'
+  Plug 'airblade/vim-gitgutter'
+  Plug 'chriskempson/base16-vim'
   Plug 'ludovicchabant/vim-gutentags'
+  Plug 'ntpeters/vim-better-whitespace'
+  Plug 'sheerun/vim-polyglot'
+  Plug 'vim-airline/vim-airline'
+  Plug 'vim-airline/vim-airline-themes'
+  Plug 'wakatime/vim-wakatime'
 call plug#end()
 
+" for Plug 'chriskempson/base16-vim'
+let base16colorspace=256
+source ~/.vimrc_background
+
+" for Plug 'ludovicchabant/vim-gutentags'
 let g:gutentags_cache_dir = '~/.gutentags_cache'
+
+" for Plug 'ntpeters/vim-better-whitespace'
+let g:better_whitespace_enabled=1
+let g:strip_whitespace_on_save=1
+
+" for Plug 'vim-airline/vim-airline'
+set laststatus=2
+let g:airline#extensions#tabline#enabled=1
+let g:airline#extensions#tabline#fnamemod=':t'
+
+" for Plug 'vim-airline/vim-airline-themes'
+let g:airline_theme='base16'