diff --git a/vim/.config/vim/plug.d/themes.vim b/vim/.config/vim/plug.d/themes.vim
index 4e55886..5feb084 100644
--- a/vim/.config/vim/plug.d/themes.vim
+++ b/vim/.config/vim/plug.d/themes.vim
@@ -1,2 +1,14 @@
 Plug 'NLKNguyen/papercolor-theme'
+Plug 'joshdick/onedark.vim'
+Plug 'morhetz/gruvbox'
+Plug 'nanotech/jellybeans.vim', { 'tag': 'v1.7' }
+Plug 'romainl/Apprentice'
 Plug 'sheerun/vim-wombat-scheme'
+Plug 'tomasr/molokai'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+
+let g:airline_powerline_fonts = 0
+let g:molokai_original = 1
+let g:onedark_hide_endofbuffer = 1
+let g:onedark_terminal_italics = 1
diff --git a/vim/.config/vim/plugin/settings.vim b/vim/.config/vim/plugin/settings.vim
index 02bfd05..79eb4de 100644
--- a/vim/.config/vim/plugin/settings.vim
+++ b/vim/.config/vim/plugin/settings.vim
@@ -36,7 +36,7 @@ set wildmenu
 
 " Status
 " ~/file [type] [line,column] [number of lines]
-set statusline=%F%m%r%h%w\ [%Y]\ [%03l,%03v]\ [%L]
+"set statusline=%F%m%r%h%w\ [%Y]\ [%03l,%03v]\ [%L]
 
 if !&scrolloff
     set scrolloff=1
@@ -51,7 +51,7 @@ if &encoding ==# 'latin1' && has('gui_running')
 endif
 
 if &listchars ==# 'eol:$'
-    set listchars=tab:\ \ ,trail:…,extends:>,precedes:<,nbsp:+
+    set listchars=tab:\ \ ,trail:…,extends:→,precedes:←,nbsp:+
 endif
 
 if v:version > 703 || v:version == 703 && has("patch541")
@@ -76,13 +76,6 @@ endif
 set sessionoptions-=options
 set viewoptions-=options
 
-" Allow color schemes to do bright colors without forcing bold.
-if &t_Co == 8 && $TERM !~# '^Eterm'
-    set t_Co=16
-else
-    set t_Co=256
-endif
-
 if empty(mapcheck('<C-U>', 'i'))
     inoremap <C-U> <C-G>u<C-U>
 endif
diff --git a/vim/.config/vim/plugin/theme.vim b/vim/.config/vim/plugin/theme.vim
index d4a881f..d4a35aa 100644
--- a/vim/.config/vim/plugin/theme.vim
+++ b/vim/.config/vim/plugin/theme.vim
@@ -1,2 +1,19 @@
-colorscheme wombat
+" Allow color schemes to do bright colors without forcing bold.
+if &t_Co == 8 && $TERM !~# '^Eterm'
+    set t_Co=16
+else
+    set t_Co=256
+endif
+
+if (has("nvim"))
+  let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+endif
+
+if (has("termguicolors"))
+  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+  set termguicolors
+endif
+
+colorscheme molokai
 set background=dark