diff --git a/vim/gvimrc.local b/vim/gvimrc.local
index 8e23219..7fc36c7 100644
--- a/vim/gvimrc.local
+++ b/vim/gvimrc.local
@@ -1,4 +1,3 @@
-colorscheme desert
-"highlight CursorLine guibg=#222222
-highlight EndSpace guibg=#802020
-match EndSpace /\s\+$/
+colorscheme evening
+
+highlight CursorLine guibg=#222222
diff --git a/vim/vimrc.local b/vim/vimrc.local
index 21b5bca..8be5fff 100644
--- a/vim/vimrc.local
+++ b/vim/vimrc.local
@@ -1,36 +1,24 @@
-" The following are commented out as they cause vim to behave a lot
-" differently from regular Vi. They are highly recommended though.
-set showcmd		" Show (partial) command in status line.
-"set showmatch		" Show matching brackets.
-"set ignorecase		" Do case insensitive matching
-"set smartcase		" Do smart case matching
-set incsearch		" Incremental search
-"set autowrite		" Automatically save before commands like :next and :make
-"set hidden             " Hide buffers when they are abandoned
-set mouse=a		" Enable mouse usage (all modes)
+set ts=2
+set sw=2
+set showcmd
+set nofsync
+set swapsync=
+set incsearch
 set hlsearch
-
-set tabstop=2
-set shiftwidth=2
-
-imap <C-F> <C-X><C-F>
-imap <C-O> <C-X><C-O>
-
-" settings for LaTeX-Suite
-set grepprg=grep\ -nH\ $*
-let g:tex_flavor='latex'
-
 set cursorline
 
-set printdevice=CanoniP4300
-set printoptions=paper:A4,syntax:y
-
-set modeline
-
-" re-use tabs, open hidden buffers in new tabs
-set switchbuf=usetab,newtab
+" Set up visible whitespace by default
+set list
+set listchars=tab:»-,trail:~,extends:>,precedes:<
+highlight NonText guifg=#808080 ctermfg=DarkGray
+highlight SpecialKey guifg=#808080 ctermfg=DarkGray
 
+" filetype dependent indentation
 filetype plugin on
-filetype indent on
+if has("autocmd")
+	filetype plugin indent on
+endif
 
-colorscheme koehler
+" Alternative for listchars above to highlight trailing spaces
+"highlight EndSpace guibg=#ff8080
+"match EndSpace /\s\+$/