diff --git a/vim/vimrc.d/airline.vim b/vim/vimrc.d/airline.vim
index 6138c19..ea91369 100644
--- a/vim/vimrc.d/airline.vim
+++ b/vim/vimrc.d/airline.vim
@@ -1,7 +1,8 @@
 set noshowmode
 
 if has("gui_running") || has("gui_vimr")
+  let g:airline_solarized_bg = 'dark'
   let g:airline_theme = 'solarized'
 endif
 
-let g:airline_powerline_fonts = 1
+let g:airline_powerline_fonts = 0
diff --git a/vim/vimrc.d/colorscheme.vim b/vim/vimrc.d/colorscheme.vim
new file mode 100644
index 0000000..9dbeeb3
--- /dev/null
+++ b/vim/vimrc.d/colorscheme.vim
@@ -0,0 +1,6 @@
+set background=dark
+colorscheme Tomorrow-Night
+
+if has("gui_running") || has("gui_vimr")
+  colorscheme solarized8_dark_high
+endif
diff --git a/vim/vimrc.d/fonts.vim b/vim/vimrc.d/fonts.vim
new file mode 100644
index 0000000..e5abf38
--- /dev/null
+++ b/vim/vimrc.d/fonts.vim
@@ -0,0 +1,8 @@
+if has("gui_running") || has("gui_vimr")
+  " Set GUI font according to OS
+  if has("gui_macvim")
+    set guifont=Sauce\ Code\ Pro\ Nerd\ Font\ Complete\ Mono:h13
+  elseif has("gui_gtk2")
+    set guifont=DejaVu\ Sans\ Mono\ 15
+  endif
+endif
diff --git a/vim/vimrc.d/gui.vim b/vim/vimrc.d/gui.vim
new file mode 100644
index 0000000..97a99d6
--- /dev/null
+++ b/vim/vimrc.d/gui.vim
@@ -0,0 +1,7 @@
+if has("gui_running") || has("gui_vimr")
+  " Remove scrollbars
+  set guioptions-=R
+  set guioptions-=r
+  set guioptions-=L
+  set guioptions-=l
+endif
diff --git a/vim/vimrc.d/markdown.vim b/vim/vimrc.d/markdown.vim
new file mode 100644
index 0000000..370ee53
--- /dev/null
+++ b/vim/vimrc.d/markdown.vim
@@ -0,0 +1 @@
+let g:markdown_fenced_languages = ['coffee', 'css', 'elixir', 'erb=eruby', 'javascript', 'js=javascript', 'json=javascript', 'ruby', 'sass', 'xml']
diff --git a/vim/vimrc.d/nerdcommenter.vim b/vim/vimrc.d/nerdcommenter.vim
new file mode 100644
index 0000000..f6a318f
--- /dev/null
+++ b/vim/vimrc.d/nerdcommenter.vim
@@ -0,0 +1,2 @@
+" Tell NERDCommenter to put spaces in
+let NERDSpaceDelims=1
diff --git a/vim/vimrc.d/nerdtree.vim b/vim/vimrc.d/nerdtree.vim
new file mode 100644
index 0000000..275d267
--- /dev/null
+++ b/vim/vimrc.d/nerdtree.vim
@@ -0,0 +1 @@
+map \ :NERDTreeToggle<CR>
diff --git a/vimrc.bundles.local b/vimrc.bundles.local
index 328fdad..509128e 100644
--- a/vimrc.bundles.local
+++ b/vimrc.bundles.local
@@ -28,12 +28,13 @@ Plug 'scrooloose/nerdcommenter'
 Plug 'tpope/vim-haml'
 Plug 'vim-ruby/vim-ruby'
 Plug 'keith/swift.vim'
+Plug 'tpope/vim-markdown'
 
 Plug 'junegunn/goyo.vim'
 Plug 'reedes/vim-pencil'
 
 " Todo
-Plug 'davidoc/taskpaper.vim'
+Plug 'tbabej/taskwiki'
 
 " Colors
 Plug 'altercation/vim-colors-solarized'
diff --git a/vimrc.local b/vimrc.local
index 870dd48..3c4d317 100644
--- a/vimrc.local
+++ b/vimrc.local
@@ -2,26 +2,6 @@
 set background=dark
 colorscheme Tomorrow-Night
 
-" Color scheme
-if has("gui_running") || has("gui_vimr")
-  " Set GUI font according to OS
-  if has("gui_macvim")
-    set guifont=Sauce\ Code\ Pro\ Nerd\ Font\ Complete\ Mono:h13
-  elseif has("gui_gtk2")
-    set guifont=DejaVu\ Sans\ Mono\ 15
-  endif
-
-  " Color scheme
-  set background=dark
-  colorscheme solarized8_dark_high
-
-  " Remove scrollbars
-  set guioptions-=R
-  set guioptions-=r
-  set guioptions-=L
-  set guioptions-=l
-endif
-
 " Display extra whitespace
 set list listchars=tab:»·,trail:·
 
@@ -39,9 +19,5 @@ if $TERM == "xterm-256color" || $TERM == "screen-256color" || $COLORTERM == "gno
   set t_Co=256
 endif
 
-" Tell NERDCommenter to put spaces in
-let NERDSpaceDelims=1
-
-
 " Extend plugins
 source $HOME/.vim/vimrc.d.vim