diff --git a/vim/vimrc.d/airline.vim b/vim/vimrc.d/airline.vim
index e01ef81..7db71d4 100644
--- a/vim/vimrc.d/airline.vim
+++ b/vim/vimrc.d/airline.vim
@@ -1,10 +1,4 @@
-let g:airline_left_sep = ' '
-let g:airline_right_sep = ' '
-
-let g:airline_enable_syntastic = 0
-let g:airline_theme = 'solarized'
-let g:airline_powerline_fonts = 0
-let g:airline_linecolumn_prefix = '␊ '
-let g:airline_linecolumn_prefix = '␤ '
-let g:airline_linecolumn_prefix = '¶ '
-let g:airline_branch_prefix = '⎇ '
+if has("gui_running") || has("gui_vimr")
+  let g:airline_theme = 'solarized'
+endif
+let g:airline_powerline_fonts = 1
diff --git a/vimrc.bundles.local b/vimrc.bundles.local
index 95d18db..d9244bb 100644
--- a/vimrc.bundles.local
+++ b/vimrc.bundles.local
@@ -40,3 +40,5 @@ Plug 'mrtazz/molokai.vim'
 Plug 'nanotech/jellybeans.vim'
 Plug 'shelling/railscasts.vim'
 Plug 'vim-scripts/wombat256.vim'
+Plug 'lifepillar/vim-solarized8'
+Plug 'iCyMind/NeoSolarized'
diff --git a/vimrc.local b/vimrc.local
index ceb2bc4..050ad8c 100644
--- a/vimrc.local
+++ b/vimrc.local
@@ -1,17 +1,19 @@
 " Color scheme
+set background=dark
 colorscheme Tomorrow-Night
 
-if has("gui_running")
+" Color scheme
+if has("gui_running") || has("gui_vimr")
   " Set GUI font according to OS
-  if has("gui_macvim") || has("gui_vimr")
-    set guifont=Source\ Code\ Pro:h14
+  if has("gui_macvim")
+    set guifont=Source\ Code\ Pro\ for\ Powerline:h13
   elseif has("gui_gtk2")
     set guifont=DejaVu\ Sans\ Mono\ 15
   endif
 
   " Color scheme
   set background=dark
-  colorscheme solarized
+  colorscheme solarized8_high
 
   " Remove scrollbars
   set guioptions-=R
@@ -40,5 +42,6 @@ endif
 " Tell NERDCommenter to put spaces in
 let NERDSpaceDelims=1
 
+
 " Extend plugins
 source $HOME/.vim/vimrc.d.vim