diff --git a/.gitmodules b/.gitmodules
index 590b628..115b576 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,9 +46,6 @@
 [submodule ".vim/bundle/vim-bufonly"]
 	path = .vim/bundle/vim-bufonly
 	url = https://github.com/schickling/vim-bufonly.git
-[submodule ".vim/bundle/molokai"]
-	path = .vim/bundle/molokai
-	url = https://github.com/tomasr/molokai.git
 [submodule ".vim/bundle/vim-abolish"]
 	path = .vim/bundle/vim-abolish
 	url = https://github.com/tpope/vim-abolish.git
@@ -124,3 +121,6 @@
 [submodule ".vim/bundle/deoplete-jedi"]
 	path = .vim/bundle/deoplete-jedi
 	url = https://github.com/deoplete-plugins/deoplete-jedi.git
+[submodule ".vim/bundle/zenburn"]
+	path = .vim/bundle/zenburn
+	url = https://github.com/jnurmine/Zenburn.git
diff --git a/.vim/bundle/molokai b/.vim/bundle/molokai
deleted file mode 160000
index c67bdfc..0000000
--- a/.vim/bundle/molokai
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c67bdfcdb31415aa0ade7f8c003261700a885476
diff --git a/.vim/bundle/zenburn b/.vim/bundle/zenburn
new file mode 160000
index 0000000..2cacfcb
--- /dev/null
+++ b/.vim/bundle/zenburn
@@ -0,0 +1 @@
+Subproject commit 2cacfcb222d9db34a8d1a13bb8bb814f039b98cd
diff --git a/.vim/options.vim b/.vim/options.vim
index 4e463c8..3ee8378 100644
--- a/.vim/options.vim
+++ b/.vim/options.vim
@@ -1,7 +1,7 @@
 set nocompatible
 
 filetype indent plugin on
-colorscheme molokai
+colorscheme zenburn
 syntax enable
 
 set autoindent
@@ -54,11 +54,7 @@ if has('gui_running')
     set guioptions-=m
     set guioptions-=r
 
-    if has('win32')
-        set guifont=Lucida_Console:h12
-    else
-        set guifont=Monospace\ 12
-    endif
+    set guifont=Terminus\ 12
 endif
 
 if has('unix')