diff --git a/vim/.vimrc b/vim/.vimrc
index de624a4..c9a7f84 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -8,29 +8,39 @@ set number
 set t_Co=256
 
 set background=dark
-" colorscheme Tomorrow-Night-Bright
 colorscheme jdkaplan
 
 set expandtab
 set tabstop=4
 set softtabstop=4
 set shiftwidth=4
+set smartindent
+set formatoptions+=n
 
 set wrap
 set linebreak
 set nolist
 set textwidth=0
 set wrapmargin=0
+set listchars=tab:>-,extends:>,precedes:<
 
 set ignorecase
 set smartcase
 
-highlight ExtraWhitespace ctermbg=red guibg=red
-match ExtraWhitespace /\s\+$/
-autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
-autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
-autocmd InsertLeave * match ExtraWhitespace /\s\+$/
-autocmd BufWinLeave * call clearmatches()
+set cursorline
+
+set splitbelow
+set splitright
+
+set modelines=0
+set lazyredraw
+
+set shortmess+=I
+
+set virtualedit=
+set display+=lastline
+noremap <silent> k gk
+noremap <silent> j gj
 
 map ; :
 noremap ;; ;
@@ -45,3 +55,10 @@ map ;% :vsplit<CR>
 map ;0 :close<CR>
 
 map ;w :w<CR>
+
+highlight ExtraWhitespace ctermbg=red guibg=red
+match ExtraWhitespace /\s\+$/
+autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
+autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
+autocmd InsertLeave * match ExtraWhitespace /\s\+$/
+autocmd BufWinLeave * call clearmatches()