diff --git a/.gitmodules b/.gitmodules
index a9e42b5..5ebc787 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "vim/bundle/nerdtree"]
 	path = vim/bundle/nerdtree
 	url = https://github.com/scrooloose/nerdtree.git
+[submodule "vim/bundle/zenburn"]
+	path = vim/bundle/zenburn
+	url = https://github.com/jnurmine/Zenburn.git
diff --git a/vim/after/ftplugin/markdown.vim b/vim/after/ftplugin/markdown.vim
deleted file mode 100644
index c48a17d..0000000
--- a/vim/after/ftplugin/markdown.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Vim filetype plugin
-" Language:     Markdown
-
-" Override default comments to fix lists
-setlocal comments=mb:*,fb:-,fb:+,n:>
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
new file mode 100644
index 0000000..87ef0b6
--- /dev/null
+++ b/vim/autoload/pathogen.vim
@@ -0,0 +1,326 @@
+" pathogen.vim - path option manipulation
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      2.2
+
+" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
+"
+" For management of individually installed plugins in ~/.vim/bundle (or
+" ~\vimfiles\bundle), adding `call pathogen#infect()` to the top of your
+" .vimrc is the only other setup necessary.
+"
+" The API is documented inline below.  For maximum ease of reading,
+" :set foldmethod=marker
+
+if exists("g:loaded_pathogen") || &cp
+  finish
+endif
+let g:loaded_pathogen = 1
+
+function! s:warn(msg)
+  echohl WarningMsg
+  echomsg a:msg
+  echohl NONE
+endfunction
+
+" Point of entry for basic default usage.  Give a relative path to invoke
+" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
+" pathogen#surround().  For backwards compatibility purposes, a full path that
+" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
+" instead.
+function! pathogen#infect(...) abort " {{{1
+  for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
+    if path =~# '^[^\\/]\+$'
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#incubate(path . '/{}')
+    elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
+      call pathogen#incubate(path)
+    elseif path =~# '[\\/]\%({}\|\*\)$'
+      call pathogen#surround(path)
+    else
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#surround(path . '/{}')
+    endif
+  endfor
+  call pathogen#cycle_filetype()
+  return ''
+endfunction " }}}1
+
+" Split a path into a list.
+function! pathogen#split(path) abort " {{{1
+  if type(a:path) == type([]) | return a:path | endif
+  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
+  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
+endfunction " }}}1
+
+" Convert a list to a path.
+function! pathogen#join(...) abort " {{{1
+  if type(a:1) == type(1) && a:1
+    let i = 1
+    let space = ' '
+  else
+    let i = 0
+    let space = ''
+  endif
+  let path = ""
+  while i < a:0
+    if type(a:000[i]) == type([])
+      let list = a:000[i]
+      let j = 0
+      while j < len(list)
+        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
+        let path .= ',' . escaped
+        let j += 1
+      endwhile
+    else
+      let path .= "," . a:000[i]
+    endif
+    let i += 1
+  endwhile
+  return substitute(path,'^,','','')
+endfunction " }}}1
+
+" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
+function! pathogen#legacyjoin(...) abort " {{{1
+  return call('pathogen#join',[1] + a:000)
+endfunction " }}}1
+
+" Remove duplicates from a list.
+function! pathogen#uniq(list) abort " {{{1
+  let i = 0
+  let seen = {}
+  while i < len(a:list)
+    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
+      call remove(a:list,i)
+    elseif a:list[i] ==# ''
+      let i += 1
+      let empty = 1
+    else
+      let seen[a:list[i]] = 1
+      let i += 1
+    endif
+  endwhile
+  return a:list
+endfunction " }}}1
+
+" \ on Windows unless shellslash is set, / everywhere else.
+function! pathogen#separator() abort " {{{1
+  return !exists("+shellslash") || &shellslash ? '/' : '\'
+endfunction " }}}1
+
+" Convenience wrapper around glob() which returns a list.
+function! pathogen#glob(pattern) abort " {{{1
+  let files = split(glob(a:pattern),"\n")
+  return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
+endfunction "}}}1
+
+" Like pathogen#glob(), only limit the results to directories.
+function! pathogen#glob_directories(pattern) abort " {{{1
+  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
+endfunction "}}}1
+
+" Turn filetype detection off and back on again if it was already enabled.
+function! pathogen#cycle_filetype() " {{{1
+  if exists('g:did_load_filetypes')
+    filetype off
+    filetype on
+  endif
+endfunction " }}}1
+
+" Check if a bundle is disabled.  A bundle is considered disabled if it ends
+" in a tilde or its basename or full name is included in the list
+" g:pathogen_disabled.
+function! pathogen#is_disabled(path) " {{{1
+  if a:path =~# '\~$'
+    return 1
+  elseif !exists("g:pathogen_disabled")
+    return 0
+  endif
+  let sep = pathogen#separator()
+  let blacklist = g:pathogen_disabled
+  return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
+endfunction "}}}1
+
+" Prepend the given directory to the runtime path and append its corresponding
+" after directory.  If the directory is already included, move it to the
+" outermost position.  Wildcards are added as is.  Ending a path in /{} causes
+" all subdirectories to be added (except those in g:pathogen_disabled).
+function! pathogen#surround(path) abort " {{{1
+  let sep = pathogen#separator()
+  let rtp = pathogen#split(&rtp)
+  if a:path =~# '[\\/]{}$'
+    let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
+    let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
+    let after  = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
+    call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
+  else
+    let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
+    let before = [path]
+    let after = [path . sep . 'after']
+    call filter(rtp, 'index(before + after, v:val) == -1')
+  endif
+  let &rtp = pathogen#join(before, rtp, after)
+  return &rtp
+endfunction " }}}1
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.  Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) " {{{1
+  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
+  return pathogen#surround(a:path . pathogen#separator() . '{}')
+endfunction " }}}1
+
+" For each directory in the runtime path, add a second entry with the given
+" argument appended.  If the argument ends in '/{}', add a separate entry for
+" each subdirectory.  The default argument is 'bundle/{}', which means that
+" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
+" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
+" UNIX).
+function! pathogen#incubate(...) abort " {{{1
+  let sep = pathogen#separator()
+  let name = a:0 ? a:1 : 'bundle/{}'
+  if "\n".s:done_bundles =~# "\\M\n".name."\n"
+    return ""
+  endif
+  let s:done_bundles .= name . "\n"
+  let list = []
+  for dir in pathogen#split(&rtp)
+    if dir =~# '\<after$'
+      if name =~# '{}$'
+        let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
+      else
+        let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
+      endif
+    else
+      if name =~# '{}$'
+        let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*'), '!pathogen#is_disabled(v:val)')
+      else
+        let list += [dir . sep . name, dir]
+      endif
+    endif
+  endfor
+  let &rtp = pathogen#join(pathogen#uniq(list))
+  return 1
+endfunction " }}}1
+
+" Deprecated alias for pathogen#incubate().
+function! pathogen#runtime_append_all_bundles(...) abort " {{{1
+  if a:0
+    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
+  else
+    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
+  endif
+  return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
+endfunction
+
+let s:done_bundles = ''
+" }}}1
+
+" Invoke :helptags on all non-$VIM doc directories in runtimepath.
+function! pathogen#helptags() abort " {{{1
+  let sep = pathogen#separator()
+  for glob in pathogen#split(&rtp)
+    for dir in split(glob(glob), "\n")
+      if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
+        silent! execute 'helptags' pathogen#fnameescape(dir.'/doc')
+      endif
+    endfor
+  endfor
+endfunction " }}}1
+
+command! -bar Helptags :call pathogen#helptags()
+
+" Execute the given command.  This is basically a backdoor for --remote-expr.
+function! pathogen#execute(...) abort " {{{1
+  for command in a:000
+    execute command
+  endfor
+  return ''
+endfunction " }}}1
+
+" Like findfile(), but hardcoded to use the runtimepath.
+function! pathogen#runtime_findfile(file,count) abort "{{{1
+  let rtp = pathogen#join(1,pathogen#split(&rtp))
+  let file = findfile(a:file,rtp,a:count)
+  if file ==# ''
+    return ''
+  else
+    return fnamemodify(file,':p')
+  endif
+endfunction " }}}1
+
+" Backport of fnameescape().
+function! pathogen#fnameescape(string) abort " {{{1
+  if exists('*fnameescape')
+    return fnameescape(a:string)
+  elseif a:string ==# '-'
+    return '\-'
+  else
+    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
+  endif
+endfunction " }}}1
+
+if exists(':Vedit')
+  finish
+endif
+
+let s:vopen_warning = 0
+
+function! s:find(count,cmd,file,lcd) " {{{1
+  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
+  let file = pathogen#runtime_findfile(a:file,a:count)
+  if file ==# ''
+    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
+  endif
+  if !s:vopen_warning
+    let s:vopen_warning = 1
+    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
+  else
+    let warning = ''
+  endif
+  if a:lcd
+    let path = file[0:-strlen(a:file)-2]
+    execute 'lcd `=path`'
+    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
+  else
+    return a:cmd.' '.pathogen#fnameescape(file) . warning
+  endif
+endfunction " }}}1
+
+function! s:Findcomplete(A,L,P) " {{{1
+  let sep = pathogen#separator()
+  let cheats = {
+        \'a': 'autoload',
+        \'d': 'doc',
+        \'f': 'ftplugin',
+        \'i': 'indent',
+        \'p': 'plugin',
+        \'s': 'syntax'}
+  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
+    let request = cheats[a:A[0]].a:A[1:-1]
+  else
+    let request = a:A
+  endif
+  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
+  let found = {}
+  for path in pathogen#split(&runtimepath)
+    let path = expand(path, ':p')
+    let matches = split(glob(path.sep.pattern),"\n")
+    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
+    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
+    for match in matches
+      let found[match] = 1
+    endfor
+  endfor
+  return sort(keys(found))
+endfunction " }}}1
+
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
+
+" vim:set et sw=2:
diff --git a/vim/bundle/zenburn b/vim/bundle/zenburn
new file mode 160000
index 0000000..a4d366b
--- /dev/null
+++ b/vim/bundle/zenburn
@@ -0,0 +1 @@
+Subproject commit a4d366b2f7f6db285bc5b0e79d1492f58236d1c2
diff --git a/vim/colors/darkdot.vim b/vim/colors/darkdot.vim
deleted file mode 100644
index 0275896..0000000
--- a/vim/colors/darkdot.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-" Vim color file
-" Maintainer:	David Lazar <david#c7.campus.utcluj.ro>
-" Last Change:	Thu May 20 16:27:13 EEST 2004
-" Version:	2.2
-" URL:		http://www.c7obs.net/~david/stuff/darkdot.vim
-" 
-" This colorscheme script was created using Hans Fugal's colorscheme template
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="darkdot"
-
-hi Normal	cterm=none			gui=none	guibg=#101020	guifg=#a8aaaa
-hi Cursor	cterm=none					guibg=#44ff44	guifg=#000000
-hi link CursorIM Cursor
-hi Directory				ctermfg=cyan				guifg=#44ffff
-hi DiffAdd	ctermbg=blue		ctermfg=yellow		guibg=#080888	guifg=#ffff00
-hi DiffDelete	ctermbg=black		ctermfg=darkgray	guibg=#080808	guifg=#444444
-hi DiffChange	ctermbg=black					guibg=#080808	guifg=#ffffff
-hi DiffText	ctermbg=black		ctermfg=darkred		guibg=#080808	guifg=#bb0000
-hi ErrorMsg	ctermbg=darkred		ctermfg=white		guibg=#880000	guifg=#ffffff
-hi Folded	ctermbg=black		ctermfg=darkblue	guibg=black	guifg=#000088
-hi link FoldColumn Folded
-hi IncSearch	ctermbg=black		ctermfg=gray		guibg=#000000	guifg=#bbcccc
-hi LineNr				ctermfg=yellow		guibg=#404040	guifg=#ffff00
-hi ModeMsg				ctermfg=white				guifg=#ffffff
-hi MoreMsg				ctermfg=green				guifg=#44ff44
-hi NonText				ctermfg=blue				guifg=#4444ff
-hi Question				ctermfg=yellow				guifg=#ffff00
-hi Search	ctermbg=NONE		ctermfg=green		guibg=NONE	guifg=green
-hi SpecialKey				ctermfg=blue				guifg=#4444ff
-hi StatusLine	cterm=none ctermbg=darkcyan	ctermfg=white	gui=none	guibg=#00aaaa	guifg=#ffffff
-hi StatusLineNC	cterm=none ctermbg=gray		ctermfg=black	gui=none	guibg=#bbbbbb	guifg=#000000
-hi link VertSplit StatusLineNC			
-hi Title				ctermfg=white				guifg=#ffffff
-hi Visual	cterm=none ctermbg=gray		ctermfg=black	gui=none	guibg=#bbbbbb	guifg=#000000
-hi link VisualNOS Visual
-hi WarningMsg				ctermfg=yellow				guifg=#ffff00
-"hi WildMenu	
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" syntax highlighting groups
-hi Comment	ctermfg=blue			guifg=#4444ff
-hi Constant	ctermfg=darkcyan		guifg=#00aaaa
-hi Identifier 	ctermfg=white			guifg=#ffffff
-hi Statement 	ctermfg=cyan			guifg=#44ffff
-hi PreProc	ctermfg=darkcyan		guifg=#00aaaa
-hi Type		ctermfg=white			guifg=#ffffff
-hi Special	ctermfg=blue	cterm=bold	guifg=#6666ff	gui=bold
-hi Underlined	ctermfg=blue			guifg=#4444ff
-hi Ignore	ctermfg=darkgray		guifg=#444444
-hi Error	ctermbg=black			ctermfg=darkred		guibg=#000000	guifg=#bb0000
-hi Todo		ctermbg=darkred			ctermfg=yellow		guibg=#aa0006	guifg=#fff300
-
-hi link Character	Constant
-hi link Number		Constant
-hi link Boolean		Constant
-hi link Float		Number
-hi link Conditional	Statement
-hi link Label		Statement
-hi link Keyword		Statement
-hi link Exception	Statement
-hi link Repeat		Statement
-hi link Include		PreProc
-hi link Define		PreProc
-hi link Macro		PreProc
-hi link PreCondit	PreProc
-hi link StorageClass	Type
-hi link Structure	Type
-hi link Typedef		Type
-hi link Tag		Special
-hi link Delimiter	Special
-hi link SpecialComment	Special
-hi link Debug		Special
-hi link FoldColumn	Folded
diff --git a/vim/colors/xoria256.vim b/vim/colors/xoria256.vim
deleted file mode 100644
index e8d7a3e..0000000
--- a/vim/colors/xoria256.vim
+++ /dev/null
@@ -1,94 +0,0 @@
-" Vim color file
-"
-" Name:       xoria256.vim
-" Version:    1.2
-" Maintainer:	Dmitriy Y. Zotikov (xio) <xio@ungrund.org>
-"
-" Should work in recent 256 color terminals.  88-color terms like urxvt are
-" unsupported.
-"
-" Don't forget to install 'ncurses-term' and set TERM to xterm-256color or
-" similar value.
-"
-" Color numbers (0-255) see:
-" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
-
-
-
-" Bla-bla ----------------------------------------------------------------------
-
-if &t_Co != 256 && ! has("gui_running")
-  echomsg ""
-  echomsg "err: please use GUI or a 256-color terminal (so that t_Co=256 could be set)"
-  echomsg ""
-  finish
-endif
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "xoria256"
-
-
-
-" The real part ----------------------------------------------------------------
-
-"" General colors
-hi Normal       ctermfg=252 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c cterm=none gui=none
-hi CursorColumn                           ctermbg=238 guibg=#444444
-hi Cursor                                 ctermbg=214 guibg=#ffaf00
-hi CursorLine                             ctermbg=238 guibg=#444444
-hi FoldColumn   ctermfg=248 guifg=#a8a8a8 ctermbg=bg  guibg=bg
-hi Folded       ctermfg=255 guifg=#eeeeee ctermbg=60  guibg=#5f5f87
-hi IncSearch    ctermfg=0   guifg=#000000 ctermbg=223 guibg=#ffdfaf cterm=none gui=none
-hi NonText      ctermfg=248 guifg=#a8a8a8 ctermbg=233 guibg=#101010 cterm=bold gui=bold
-hi Pmenu        ctermfg=0   guifg=#000000 ctermbg=246 guibg=#949494
-hi PmenuSbar                              ctermbg=243 guibg=#767676
-hi PmenuSel     ctermfg=0   guifg=#000000 ctermbg=243 guibg=#767676
-hi PmenuThumb                             ctermbg=252 guibg=#d0d0d0
-hi Search       ctermfg=0   guifg=#000000 ctermbg=149 guibg=#afdf5f
-hi SignColumn   ctermfg=248 guifg=#a8a8a8
-hi SpecialKey   ctermfg=77  guifg=#5fdf5f
-hi StatusLine                             ctermbg=239 guibg=#4e4e4e cterm=bold gui=bold
-hi StatusLineNC                           ctermbg=237 guibg=#3a3a3a cterm=none gui=none
-hi TabLine      ctermfg=fg  guifg=fg      ctermbg=242 guibg=#666666 cterm=underline gui=underline
-hi TabLineFill  ctermfg=fg  guifg=fg      ctermbg=242 guibg=#666666 cterm=underline gui=underline
-hi VertSplit    ctermfg=237 guifg=#3a3a3a ctermbg=237 guibg=#3a3a3a cterm=none gui=none
-hi Visual       ctermfg=24  guifg=#005f87 ctermbg=153 guibg=#afdfff
-hi VIsualNOS    ctermfg=24  guifg=#005f87 ctermbg=153 guibg=#afdfff cterm=none gui=none
-hi WildMenu     ctermfg=0   guifg=#000000 ctermbg=150 guibg=#afdf87 cterm=bold gui=bold
-
-"" Syntax highlighting
-hi Comment      ctermfg=244 guifg=#808080
-hi Constant     ctermfg=229 guifg=#ffffaf
-hi Error        ctermfg=15  guifg=#ffffff ctermbg=1   guibg=#800000
-hi ErrorMsg     ctermfg=15  guifg=#ffffff ctermbg=1   guibg=#800000
-hi Identifier   ctermfg=182 guifg=#dfafdf                           cterm=none
-hi Ignore       ctermfg=238 guifg=#444444
-hi LineNr       ctermfg=248 guifg=#a8a8a8 ctermbg=233 guibg=#101010
-hi MatchParen   ctermfg=188 guifg=#dfdfdf ctermbg=68  guibg=#5f87df cterm=bold gui=bold
-hi Number       ctermfg=180 guifg=#dfaf87
-hi PreProc      ctermfg=150 guifg=#afdf87
-hi Special      ctermfg=174 guifg=#df8787
-hi Statement    ctermfg=110 guifg=#87afdf                           cterm=none gui=none
-hi Todo         ctermfg=0   guifg=#000000 ctermbg=184 guibg=#dfdf00
-hi Type         ctermfg=146 guifg=#afafdf                           cterm=none gui=none
-hi Underlined   ctermfg=39  guifg=#00afff                           cterm=underline gui=underline
-
-"" Special
-""" .diff
-hi diffAdded    ctermfg=150 guifg=#afdf87
-hi diffRemoved  ctermfg=174 guifg=#df8787
-""" vimdiff
-hi diffAdd      ctermfg=bg  guifg=bg      ctermbg=151 guibg=#afdfaf
-"hi diffDelete   ctermfg=bg  guifg=bg      ctermbg=186 guibg=#dfdf87 cterm=none gui=none
-hi diffDelete   ctermfg=bg  guifg=bg      ctermbg=246 guibg=#949494 cterm=none gui=none
-hi diffChange   ctermfg=bg  guifg=bg      ctermbg=181 guibg=#dfafaf
-hi diffText     ctermfg=bg  guifg=bg      ctermbg=174 guibg=#df8787 cterm=none gui=none
-
-" vim: set expandtab tabstop=2 shiftwidth=2 smarttab softtabstop=2:
diff --git a/vim/colors/zenburn.vim b/vim/colors/zenburn.vim
deleted file mode 100644
index f1a0d96..0000000
--- a/vim/colors/zenburn.vim
+++ /dev/null
@@ -1,636 +0,0 @@
-" Vim color file
-" Maintainer:   Jani Nurminen <slinky@iki.fi>
-" Version:      v 2.22
-" URL:          http://slinky.imukuppi.org/zenburnpage/
-" License:      GNU GPL <http://www.gnu.org/licenses/gpl.html>
-"
-" Nothing too fancy, just some alien fruit salad to keep you in the zone.
-" This syntax file was designed to be used with dark environments and
-" low light situations. Of course, if it works during a daybright office, go
-" ahead :)
-"
-" Owes heavily to other Vim color files! With special mentions
-" to "BlackDust", "Camo" and "Desert".
-"
-" To install, copy to ~/.vim/colors directory.
-"
-" Alternatively, you can use Vimball installation:
-"     vim zenburn.vba
-"     :so %
-"     :q
-"
-" For details, see :help vimball
-"
-" After installation, use it with :colorscheme zenburn.
-" See also :help syntax
-"
-" Credits:
-"  - Jani Nurminen - original Zenburn, maintainer
-"  - Steve Hall & Cream posse - higher-contrast Visual selection
-"  - Kurt Maier - 256 color console coloring, low and high contrast toggle,
-"                 bug fixing
-"  - Charlie - spotted too bright StatusLine in non-high contrast mode
-"  - Pablo Castellazzi - CursorLine fix for 256 color mode
-"  - Tim Smith - force dark background
-"  - John Gabriele - spotted bad Ignore-group handling
-"  - Zac Thompson - spotted invisible NonText in low contrast mode
-"  - Christophe-Marie Duquesne - suggested making a Vimball,
-"    suggested support for ctags_highlighting.vim
-"  - Andrew Wagner - noted the CursorColumn bug (guifg was unintentionally set),
-"                    unify CursorColumn colour
-"  - Martin Langasek - clarify the license, whitespace fixes
-"  - Marcin Szamotulski - support autocomplete for Zenburn configuration
-"                         parameters
-"  - Clayton Parker (claytron) - Convinced by Kurt Maier to use Zenburn. Point
-"    out issues with LineNr, fix directory styles, and their usage in MacVim.
-"  - Paweł Piekarski - Spotted bad FoldColumn and TabLine. Made better 
-"                      FoldColumn colors, fixed TabLine colors.
-"  - Jim - Fix for missing Include group for terminal
-"  - Peter (Sakartu) - ColorColumn fixes
-"  - Please see git log for the others not listed here
-"
-" CONFIGURABLE PARAMETERS:
-"
-" You can use the default (don't set any parameters), or you can
-" set some parameters to tweak the Zenburn colours.
-"
-" To use them, put them into your .vimrc file before loading the color scheme,
-" example:
-"    let g:zenburn_high_Contrast=1
-"    colors zenburn
-"
-" You can also do ":let g:zenburn" then hit Ctrl-d or Tab to scroll through the
-" list of configurable parameters.
-"
-" * You can now set a darker background for bright environments. To activate, use:
-"      let g:zenburn_high_Contrast = 1
-"
-" * For transparent terminals set the background to black with:
-"      let g:zenburn_transparent = 1
-"
-" * For example, Vim help files uses the Ignore-group for the pipes in tags
-"   like "|somelink.txt|". By default, the pipes are not visible, as they
-"   map to Ignore group. If you wish to enable coloring of the Ignore group,
-"   set the following parameter to 1. Warning, it might make some syntax files
-"   look strange.
-"
-"      let g:zenburn_color_also_Ignore = 1
-"
-" * To get more contrast to the Visual selection, use
-"
-"      let g:zenburn_alternate_Visual = 1
-"
-"   Note: this is enabled only if the old-style Visual
-"   if used, see g:zenburn_old_Visual
-"
-" * To use alternate colouring for Error message, use
-"
-"      let g:zenburn_alternate_Error = 1
-"
-" * The new default for Include is a duller orange. To use the original
-"   colouring for Include, use
-"
-"      let g:zenburn_alternate_Include = 1
-"
-" * To disable underlining for Labels, use
-"
-"      let g:zenburn_disable_Label_underline = 1
-"
-" * Work-around to a Vim bug, it seems to misinterpret ctermfg and 234 and 237
-"   as light values, and sets background to light for some people. If you have
-"   this problem, use:
-"
-"      let g:zenburn_force_dark_Background = 1
-"
-" * By default the CursorColumn is of a lighter colour. I find it more readable
-"   that way, but some people may want to align it with the darker CursorLine
-"   color, for visual uniformity. To do so, use:
-"
-"      let g:zenburn_unified_CursorColumn = 1
-"
-"   Note: you can ignore this unless you use
-"   ":set cursorline cursorcolumn", since otherwise the effect won't be
-"   seen.
-"
-" * New (dark) Visual coloring has been introduced.
-"   The dark Visual is more aligned with the rest of the colour scheme,
-"   especially if you use line numbers. If you wish to use the 
-"   old Visual coloring, use
-"
-"      let g:zenburn_old_Visual = 1
-"
-"   Default is to use the new Visual.
-"
-"  * EXPERIMENTAL FEATURE: Zenburn would like to support TagHighlight
-"    (an evolved ctags-highlighter) by Al Budden (homepage:
-"    http://www.cgtk.co.uk/vim-scripts/taghighlight).
-"    Current support status is broken: there is no automatic detection of
-"    TagHighlight, no specific language support; however there is some basic
-"    support for Python. If you are a user of TagHighlight and want to help,
-"    please enable:
-"
-"      let g:zenburn_enable_TagHighlight=1
-"
-"    and improve the corresponding block at the end of the file.
-"
-" NOTE:
-"
-" * To turn the parameter(s) back to defaults, use UNLET or set them to 0:
-"
-"      unlet g:zenburn_alternate_Include
-"   or 
-"      let g:zenburn_alternate_Include = 0
-"
-"
-" That's it, enjoy!
-"
-" TODO
-"   - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble
-"   - IME colouring (CursorIM)
-
-" Set defaults, but keep any parameters already set by the user
-if ! exists("g:zenburn_high_Contrast")
-    let g:zenburn_high_Contrast = 0
-endif
-
-if ! exists("g:zenburn_transparent")
-    let g:zenburn_transparent = 0
-endif
-
-if ! exists("g:zenburn_color_also_Ignore")
-    let g:zenburn_color_also_Ignore = 0
-endif
-
-if ! exists("g:zenburn_alternate_Error")
-    let g:zenburn_alternate_Error = 0
-endif
-
-if ! exists("g:zenburn_force_dark_Background")
-    let g:zenburn_force_dark_Background = 0
-endif
-
-if ! exists("g:zenburn_alternate_Visual")
-    let g:zenburn_alternate_Visual = 0
-endif
-
-if ! exists("g:zenburn_alternate_Include")
-    let g:zenburn_alternate_Include = 0
-endif
-
-if ! exists("g:zenburn_disable_Label_underline")
-    let g:zenburn_disable_Label_underline = 0
-endif
-
-if ! exists("g:zenburn_unified_CursorColumn")
-    let g:zenburn_unified_CursorColumn = 0
-endif
-
-if ! exists("g:zenburn_old_Visual")
-    let g:zenburn_old_Visual = 0
-endif
-
-if ! exists("g:zenburn_enable_TagHighlight")
-    let g:zenburn_enable_TagHighlight = 0
-endif
-
-" -----------------------------------------------
-
-set background=dark
-
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="zenburn"
-
-hi Boolean         guifg=#dca3a3
-hi Character       guifg=#dca3a3 gui=bold
-hi Comment         guifg=#7f9f7f gui=italic
-hi Conditional     guifg=#f0dfaf gui=bold
-hi Constant        guifg=#dca3a3 gui=bold
-hi Cursor          guifg=#000d18 guibg=#8faf9f gui=bold
-hi Debug           guifg=#bca3a3 gui=bold
-hi Define          guifg=#ffcfaf gui=bold
-hi Delimiter       guifg=#8f8f8f
-hi DiffAdd         guifg=#709080 guibg=#313c36 gui=bold
-hi DiffChange      guibg=#333333
-hi DiffDelete      guifg=#333333 guibg=#464646
-hi DiffText        guifg=#ecbcbc guibg=#41363c gui=bold
-hi Directory       guifg=#9fafaf gui=bold
-hi ErrorMsg        guifg=#80d4aa guibg=#2f2f2f gui=bold
-hi Exception       guifg=#c3bf9f gui=bold
-hi Float           guifg=#c0bed1
-hi FoldColumn      guifg=#93b3a3 guibg=#3f4040
-hi Folded          guifg=#93b3a3 guibg=#3f4040
-hi Function        guifg=#efef8f
-hi Identifier      guifg=#efdcbc
-hi IncSearch       guibg=#f8f893 guifg=#385f38
-hi Keyword         guifg=#f0dfaf gui=bold
-hi Macro           guifg=#ffcfaf gui=bold
-hi ModeMsg         guifg=#ffcfaf gui=none
-hi MoreMsg         guifg=#ffffff gui=bold
-hi Number          guifg=#8cd0d3
-hi Operator        guifg=#f0efd0
-hi PreCondit       guifg=#dfaf8f gui=bold
-hi PreProc         guifg=#ffcfaf gui=bold
-hi Question        guifg=#ffffff gui=bold
-hi Repeat          guifg=#ffd7a7 gui=bold
-hi Search          guifg=#ffffe0 guibg=#284f28
-hi SpecialChar     guifg=#dca3a3 gui=bold
-hi SpecialComment  guifg=#82a282 gui=bold
-hi Special         guifg=#cfbfaf
-hi SpecialKey      guifg=#9ece9e
-hi Statement       guifg=#e3ceab gui=none
-hi StatusLine      guifg=#313633 guibg=#ccdc90
-hi StatusLineNC    guifg=#2e3330 guibg=#88b090
-hi StorageClass    guifg=#c3bf9f gui=bold
-hi String          guifg=#cc9393
-hi Structure       guifg=#efefaf gui=bold
-hi Tag             guifg=#e89393 gui=bold
-hi Title           guifg=#efefef gui=bold
-hi Todo            guifg=#dfdfdf guibg=bg gui=bold
-hi Typedef         guifg=#dfe4cf gui=bold
-hi Type            guifg=#dfdfbf gui=bold
-hi Underlined      guifg=#dcdccc gui=underline
-hi VertSplit       guifg=#2e3330 guibg=#688060
-hi VisualNOS       guifg=#333333 guibg=#f18c96 gui=bold,underline
-hi WarningMsg      guifg=#ffffff guibg=#333333 gui=bold
-hi WildMenu        guibg=#2c302d guifg=#cbecd0 gui=underline
-
-hi SpellBad   guisp=#bc6c4c guifg=#dc8c6c
-hi SpellCap   guisp=#6c6c9c guifg=#8c8cbc
-hi SpellRare  guisp=#bc6c9c guifg=#bc8cbc
-hi SpellLocal guisp=#7cac7c guifg=#9ccc9c
-
-" Entering Kurt zone
-if &t_Co > 255
-    hi Boolean         ctermfg=181
-    hi Character       ctermfg=181   cterm=bold
-    hi Comment         ctermfg=108
-    hi Conditional     ctermfg=223   cterm=bold
-    hi Constant        ctermfg=181   cterm=bold
-    hi Cursor          ctermfg=233   ctermbg=109     cterm=bold
-    hi Debug           ctermfg=181   cterm=bold
-    hi Define          ctermfg=223   cterm=bold
-    hi Delimiter       ctermfg=245
-    hi DiffAdd         ctermfg=66    ctermbg=237     cterm=bold
-    hi DiffChange      ctermbg=236
-    hi DiffDelete      ctermfg=236   ctermbg=238
-    hi DiffText        ctermfg=217   ctermbg=237     cterm=bold
-    hi Directory       ctermfg=109   cterm=bold
-    hi ErrorMsg        ctermfg=115   ctermbg=236     cterm=bold
-    hi Exception       ctermfg=249   cterm=bold
-    hi Float           ctermfg=251
-    hi Function        ctermfg=228
-    hi Identifier      ctermfg=223
-    hi Include         ctermfg=180   cterm=bold
-    hi IncSearch       ctermbg=228   ctermfg=238
-    hi Keyword         ctermfg=223   cterm=bold
-    hi LineNr          ctermfg=248   ctermbg=233
-    hi Macro           ctermfg=223   cterm=bold
-    hi ModeMsg         ctermfg=223   cterm=none
-    hi MoreMsg         ctermfg=15    cterm=bold
-    hi Number          ctermfg=116
-    hi Operator        ctermfg=230
-    hi PreCondit       ctermfg=180   cterm=bold
-    hi PreProc         ctermfg=223   cterm=bold
-    hi Question        ctermfg=15    cterm=bold
-    hi Repeat          ctermfg=223   cterm=bold
-    hi Search          ctermfg=230   ctermbg=236
-    hi SpecialChar     ctermfg=181   cterm=bold
-    hi SpecialComment  ctermfg=108   cterm=bold
-    hi Special         ctermfg=181
-    hi SpecialKey      ctermfg=151
-    hi Statement       ctermfg=187   ctermbg=234     cterm=none
-    hi StatusLine      ctermfg=236   ctermbg=186
-    hi StatusLineNC    ctermfg=235   ctermbg=108
-    hi StorageClass    ctermfg=249   cterm=bold
-    hi String          ctermfg=174
-    hi Structure       ctermfg=229   cterm=bold
-    hi Tag             ctermfg=181   cterm=bold
-    hi Title           ctermfg=7     ctermbg=234     cterm=bold
-    hi Todo            ctermfg=108   ctermbg=234     cterm=bold
-    hi Typedef         ctermfg=253   cterm=bold
-    hi Type            ctermfg=187   cterm=bold
-    hi Underlined      ctermfg=188   ctermbg=234     cterm=bold
-    hi VertSplit       ctermfg=236   ctermbg=65
-    hi VisualNOS       ctermfg=236   ctermbg=210     cterm=bold
-    hi WarningMsg      ctermfg=15    ctermbg=236     cterm=bold
-    hi WildMenu        ctermbg=236   ctermfg=194     cterm=bold
-
-    " spellchecking, always "bright" background
-    hi SpellLocal ctermfg=14  ctermbg=237
-    hi SpellBad   ctermfg=9   ctermbg=237
-    hi SpellCap   ctermfg=12  ctermbg=237
-    hi SpellRare  ctermfg=13  ctermbg=237
-
-    " pmenu
-    hi PMenu      ctermfg=248  ctermbg=0
-    hi PMenuSel   ctermfg=223 ctermbg=235
-
-    if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
-        hi Normal ctermfg=188 ctermbg=234
-        hi NonText         ctermfg=238
-
-        if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
-            hi Ignore          ctermfg=238
-        endif
-
-        " hc mode, darker CursorLine, default 236
-        hi CursorLine      ctermbg=233   cterm=none
-
-        if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
-            hi CursorColumn      ctermbg=233   cterm=none
-        else
-            hi CursorColumn      ctermbg=235   cterm=none
-        endif
-
-        hi ColorColumn     ctermbg=235
-    else
-        hi Normal ctermfg=188 ctermbg=237
-        hi Cursor          ctermbg=109
-        hi diffadd         ctermbg=237
-        hi diffdelete      ctermbg=238
-        hi difftext        ctermbg=237
-        hi errormsg        ctermbg=237
-        hi incsearch       ctermbg=228
-        hi linenr          ctermbg=235
-        hi search          ctermbg=238
-        hi statement       ctermbg=237
-        hi statusline      ctermbg=144
-        hi statuslinenc    ctermbg=108
-        hi title           ctermbg=237
-        hi todo            ctermbg=237
-        hi underlined      ctermbg=237
-        hi vertsplit       ctermbg=65
-        hi visualnos       ctermbg=210
-        hi warningmsg      ctermbg=236
-        hi wildmenu        ctermbg=236
-        hi NonText         ctermfg=240
-
-        if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
-            hi Ignore          ctermfg=240
-        endif
-
-        " normal mode, lighter CursorLine
-        hi CursorLine      ctermbg=238   cterm=none
-
-        if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
-            hi CursorColumn      ctermbg=238   cterm=none
-        else
-            hi CursorColumn      ctermbg=239   cterm=none
-        endif
-
-        hi ColorColumn     ctermbg=238
-    endif
-
-    if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error
-        " use more jumpy Error
-        hi Error ctermfg=210 ctermbg=52 gui=bold
-    else
-        " default is something more zenburn-compatible
-        hi Error ctermfg=228 ctermbg=95 gui=bold
-    endif
-
-    if exists("g:zenburn_alternate_Include") && g:zenburn_alternate_Include
-        " original setting
-        hi Include      ctermfg=223   cterm=bold
-    else
-        " new, less contrasted one
-        hi Include      ctermfg=180   cterm=bold
-    endif
-
-    if exists("g:zenburn_disable_Label_underline") && g:zenburn_disable_Label_underline
-        hi Label       ctermfg=187
-    else
-        hi Label       ctermfg=187   cterm=underline
-    endif
-endif
-
-if exists("g:zenburn_force_dark_Background") && g:zenburn_force_dark_Background
-    " Force dark background, because of a bug in VIM:  VIM sets background
-    " automatically during "hi Normal ctermfg=X"; it misinterprets the high
-    " value (234 or 237 above) as a light color, and wrongly sets background to
-    " light.  See ":help highlight" for details.
-    set background=dark
-endif
-
-if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
-    " use new darker background
-    hi Normal          guifg=#dcdccc guibg=#1f1f1f
-    hi CursorLine      guibg=#121212 gui=bold
-    if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
-        hi CursorColumn    guibg=#121212 gui=bold
-    else
-        hi CursorColumn    guibg=#2b2b2b
-    endif
-    hi Pmenu           guibg=#242424 guifg=#ccccbc
-    hi PMenuSel        guibg=#353a37 guifg=#ccdc90 gui=bold
-    hi PmenuSbar       guibg=#2e3330 guifg=#000000
-    hi PMenuThumb      guibg=#a0afa0 guifg=#040404
-    hi MatchParen      guifg=#f0f0c0 guibg=#383838 gui=bold
-    hi SignColumn      guifg=#9fafaf guibg=#181818 gui=bold
-    hi NonText         guifg=#404040 gui=bold
-
-    hi LineNr          guifg=#9fafaf guibg=#161616
-
-    hi ColorColumn     guibg=#33332f
-else
-    " Original, lighter background
-    hi Normal          guifg=#dcdccc guibg=#3f3f3f
-    hi CursorLine      guibg=#434443
-    if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
-        hi CursorColumn    guibg=#434343
-    else
-        hi CursorColumn    guibg=#4f4f4f
-    endif
-    hi Pmenu           guibg=#2c2e2e guifg=#9f9f9f
-    hi PMenuSel        guibg=#242424 guifg=#d0d0a0 gui=bold
-    hi PmenuSbar       guibg=#2e3330 guifg=#000000
-    hi PMenuThumb      guibg=#a0afa0 guifg=#040404
-    hi MatchParen      guifg=#b2b2a0 guibg=#2e2e2e gui=bold
-    hi SignColumn      guifg=#9fafaf guibg=#343434 gui=bold
-    hi NonText         guifg=#5b605e gui=bold
-
-    hi LineNr          guifg=#9fafaf guibg=#262626
-
-    hi ColorColumn     guibg=#484848
-endif
-
-if exists("g:zenburn_transparent") && g:zenburn_transparent
-    hi Normal             ctermbg=0     guibg=#000000
-    hi Statement          ctermbg=NONE
-    hi Title              ctermbg=NONE
-    hi Todo               ctermbg=NONE
-    hi Underlined         ctermbg=NONE
-    hi DiffAdd            ctermbg=NONE
-    hi DiffText           ctermbg=NONE
-    hi ErrorMsg           ctermbg=NONE
-    hi LineNr             ctermbg=NONE
-endif
-
-if exists("g:zenburn_old_Visual") && g:zenburn_old_Visual
-    if exists("g:zenburn_alternate_Visual") && g:zenburn_alternate_Visual
-        " Visual with more contrast, thanks to Steve Hall & Cream posse
-        " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier
-        hi Visual          guifg=#000000 guibg=#71d3b4 gui=none
-        hi VisualNOS       guifg=#000000 guibg=#71d3b4 gui=none
-    else
-        " use default visual
-        hi Visual          guifg=#233323 guibg=#71d3b4 gui=none
-        hi VisualNOS       guifg=#233323 guibg=#71d3b4 gui=none
-    endif
-else
-    " new Visual style
-    if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
-        " high contrast
-        "hi Visual        guibg=#304a3d
-        "hi VisualNos     guibg=#304a3d
-        "TODO no nice greenish in console, 65 is closest. use full black instead,
-        "although i like the green..!
-        hi Visual        guibg=#0f0f0f
-        hi VisualNos     guibg=#0f0f0f
-        if &t_Co > 255
-            if exists("g:zenburn_transparent") && g:zenburn_transparent
-                hi Visual ctermbg=235
-            else
-                hi Visual ctermbg=0
-            endif
-        endif
-    else
-        " low contrast
-        hi Visual        guibg=#2f2f2f
-        hi VisualNOS     guibg=#2f2f2f
-
-        if &t_Co > 255
-            hi Visual    ctermbg=235
-            hi VisualNOS ctermbg=235
-        endif
-    endif
-endif
-
-if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error
-    " use more jumpy Error
-    hi Error        guifg=#e37170 guibg=#664040 gui=bold
-else
-    " default is something more zenburn-compatible
-    hi Error        guifg=#e37170 guibg=#3d3535 gui=none
-endif
-
-if exists("g:zenburn_alternate_Include") && g:zenburn_alternate_Include
-    " original setting
-    hi Include      guifg=#ffcfaf gui=bold
-else
-    " new, less contrasted one
-    hi Include      guifg=#dfaf8f gui=bold
-endif
-
-if exists("g:zenburn_disable_Label_underline") && g:zenburn_disable_Label_underline
-    hi Label       guifg=#dfcfaf
-else
-    hi Label       guifg=#dfcfaf gui=underline
-endif
-
-if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
-    " color the Ignore groups
-    " note: if you get strange coloring for your files, turn this off (unlet)
-    hi Ignore guifg=#545a4f
-endif
-
-" new tabline and fold column
-if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
-    hi FoldColumn    guibg=#161616
-    hi Folded        guibg=#161616
-    hi TabLine       guifg=#88b090 guibg=#313633 gui=none
-    hi TabLineSel    guifg=#ccd990 guibg=#222222
-    hi TabLineFill   guifg=#88b090 guibg=#313633 gui=none
-
-    hi SpecialKey    guibg=#242424
-
-    if &t_Co > 255
-        hi FoldColumn    ctermbg=233 ctermfg=109
-        hi Folded        ctermbg=233 ctermfg=109
-        hi TabLine       ctermbg=236 ctermfg=108 cterm=none
-        hi TabLineSel    ctermbg=235 ctermfg=186 cterm=bold
-        hi TabLineFill   ctermbg=236 ctermfg=236 cterm=bold
-    endif
-else
-    hi FoldColumn    guibg=#333333
-    hi Folded        guibg=#333333
-    hi TabLine       guifg=#d0d0b8 guibg=#222222 gui=none
-    hi TabLineSel    guifg=#f0f0b0 guibg=#333333 gui=bold
-    hi TabLineFill   guifg=#dccdcc guibg=#101010 gui=none
-
-    hi SpecialKey    guibg=#444444
-
-    if &t_Co > 255
-        hi FoldColumn    ctermbg=236 ctermfg=109
-        hi Folded        ctermbg=236 ctermfg=109
-        hi TabLine       ctermbg=235 ctermfg=187 cterm=none
-        hi TabLineSel    ctermbg=236 ctermfg=229 cterm=bold
-        hi TabLineFill   ctermbg=233 ctermfg=233 cterm=bold
-    endif
-endif
-
-" EXPERIMENTAL TagHighlight support
-" link/set sensible defaults here;
-"
-" For now I mostly link to subset of Zenburn colors, the linkage is based
-" on appearance, not semantics. In later versions I might define more new colours.
-"
-" HELP NEEDED to make this work properly.
-
-if exists("g:zenburn_enable_TagHighlight") && g:zenburn_enable_TagHighlight
-        " CTag support may vary, but the first step is to start using it so
-        " we can fix it!
-        "
-        " Consult /plugin/TagHighlight/data/kinds.txt for info on your
-        " language and what's been defined.
-        "
-        " There is potential for language indepedent features here. (Acutally,
-        " seems it may be required for this to be useful...) This way we can
-        " implement features depending on how well CTags are currently implemented
-        " for the language. ie. Global problem for python is annoying.  Special
-        " colors are defined for special language features, etc..
-        "
-        " For now all I care about is python supported features:
-        "   c:CTagsClass
-        "   f:CTagsFunction
-        "   i:CTagsImport
-        "   m:CTagsMember
-        "   v:CTagsGlobalVariable
-        "
-        "   Note: TagHighlight defaults to setting new tags to Keyword
-        "   highlighting.
-
-        " TODO conditionally run each section
-        " BEGIN Python Section
-        hi link Class        Function
-        hi link Import       PythonInclude
-        hi link Member       Function
-        "Note: Function is already defined
-
-        " Highlighter seems to think a lot of things are global variables even
-        " though they're not. Example: python method-local variable is
-        " coloured as a global variable. They should not be global, since
-        " they're not visible outside the method.
-        " If this is some very bright colour group then things look bad.
-        " hi link GlobalVariable    Identifier
-
-        " Because of this problem I am disabling the feature by setting it to
-        " Normal instead
-        hi link GlobalVariable Normal
-        " END Python Section
-
-        " Starting point for other languages.
-        hi link GlobalConstant    Constant
-        hi link EnumerationValue  Float
-        hi link EnumerationName   Identifier
-        hi link DefinedName       WarningMsg
-        hi link LocalVariable     WarningMsg
-        hi link Structure         WarningMsg
-        hi link Union             WarningMsg
-endif
-
-" TODO check for more obscure syntax groups that they're ok
-
diff --git a/vim/filetype.vim b/vim/filetype.vim
deleted file mode 100644
index 145a432..0000000
--- a/vim/filetype.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-if exists("did_load_filetypes")
-	finish
-endif
-
-augroup filetypedetect
-
-au BufRead,BufNewFile /etc/nginx/conf/* set ft=nginx
-au BufRead,BufNewFile *.md,*.markdown   set ft=markdown
-au BufNewFile,BufRead *.srt             set ft=srt
-
-augroup END
diff --git a/vim/after/ftplugin/taskedit.vim b/vim/ftplugin/taskedit.vim
similarity index 100%
rename from vim/after/ftplugin/taskedit.vim
rename to vim/ftplugin/taskedit.vim
diff --git a/vim/after/ftplugin/yaml.vim b/vim/ftplugin/yaml.vim
similarity index 100%
rename from vim/after/ftplugin/yaml.vim
rename to vim/ftplugin/yaml.vim
diff --git a/vim/scripts/sparkup.vim b/vim/scripts/sparkup.vim
deleted file mode 100644
index 6deb4bc..0000000
--- a/vim/scripts/sparkup.vim
+++ /dev/null
@@ -1,20 +0,0 @@
-" Sparkup
-" Installation:
-" 1. Put it in ~/.vim/scripts
-" 2. Add this to ~/.vimrc:
-"     autocmd FileType html source ~/.vim/scripts/sparkup.vim
-"
-map <C-e> <Esc>:.!sparkup<Cr>:call SparkupNext()<Cr>
-imap <C-e> <Esc>:.!sparkup<Cr>:call SparkupNext()<Cr>
-map <C-n> <Esc>:call SparkupNext()<Cr>
-imap <C-n> <Esc>:call SparkupNext()<Cr>
-function! SparkupNext()
-    " 1: empty tag, 2: empty attribute, 3: empty line
-    let n = search('><\/\|\(""\)\|^\s*$', 'Wp')
-    if n == 3
-        startinsert!
-    else
-        execute 'normal l'
-        startinsert
-    endif
-endfunction
diff --git a/vim/syntax/mediawiki.vim b/vim/syntax/mediawiki.vim
deleted file mode 100644
index 950b016..0000000
--- a/vim/syntax/mediawiki.vim
+++ /dev/null
@@ -1,293 +0,0 @@
-" mediawiki.vim (formerly named Wikipedia.vim)
-" 
-" Vim syntax file
-" Language: MediaWiki, http://www.mediawiki.org/
-" Maintainer: This syntax file needs a maintainer in order to ship 
-"     with Vim. Please contact [[User:Unforgettableid]] if you want
-"     to volunteer.
-" Home: http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim
-" Last Change: 2011 Sep 19
-" Credits: [[User:Aepd87]], [[User:Danny373]], [[User:Ingo Karkat]], et al.
-" 
-" Published on Wikipedia in 2003-04 and declared authorless.
-" 
-" Based on the HTML syntax file. Probably too closely based, in fact.
-" There may well be name collisions everywhere, but ignorance is bliss,
-" so they say.
-"
-" To do: plug-in support for downloading and uploading to the server.
- 
-if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
-    finish
-  endif
-  let main_syntax = "html"
-endif
- 
-syntax case ignore
-if v:version >= 700
-  syntax spell toplevel
-endif
- 
-" Mark illegal characters
-sy match htmlError "[<>&]"
- 
-" Tags
-sy region  htmlString   contained start=+"+                        end=+"+ contains=htmlSpecialChar,@htmlPreproc
-sy region  htmlString   contained start=+'+                        end=+'+ contains=htmlSpecialChar,@htmlPreproc
-sy match   htmlValue    contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1         contains=@htmlPreproc
-sy region  htmlEndTag             start=+</+                       end=+>+ contains=htmlTagN,htmlTagError
-sy region  htmlTag                start=+<[^/]+                    end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
-sy match   htmlTagN     contained +<\s*[-a-zA-Z0-9]\++hs=s+1               contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
-sy match   htmlTagN     contained +</\s*[-a-zA-Z0-9]\++hs=s+2              contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
-sy match   htmlTagError contained "[^>]<"ms=s+1
- 
-" Allowed HTML tag names
-sy keyword htmlTagName contained big blockquote br caption center cite code
-sy keyword htmlTagName contained dd del div dl dt font hr ins li
-sy keyword htmlTagName contained ol p pre rb rp rt ruby s small span strike sub
-sy keyword htmlTagName contained sup table td th tr tt ul var
-sy match   htmlTagName contained "\<\(b\|i\|u\|h[1-6]\|em\|strong\)\>"
-" Allowed Wiki tag names
-sy keyword htmlTagName contained math nowiki references source syntaxhighlight
- 
-" Allowed arg names
-sy keyword htmlArg contained align lang dir width height nowrap bgcolor clear
-sy keyword htmlArg contained noshade cite datetime size face color type start
-sy keyword htmlArg contained value compact summary border frame rules
-sy keyword htmlArg contained cellspacing cellpadding valign char charoff
-sy keyword htmlArg contained colgroup col span abbr axis headers scope rowspan
-sy keyword htmlArg contained colspan id class name style title
- 
-" Special characters
-sy match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
- 
-" Comments
-sy region htmlComment                start=+<!+                end=+>+     contains=htmlCommentPart,htmlCommentError
-sy match  htmlCommentError contained "[^><!]"
-sy region htmlCommentPart  contained start=+--+                end=+--\s*+ contains=@htmlPreProc
-sy region htmlComment                start=+<!DOCTYPE+ keepend end=+>+
- 
-if !exists("html_no_rendering")
-  sy cluster htmlTop contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,@htmlPreproc
- 
-  sy region htmlBold                          start="<b\>"      end="</b>"me=e-4      contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
-  sy region htmlBold                          start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
-  sy region htmlBoldUnderline       contained start="<u\>"      end="</u>"me=e-4      contains=@htmlTop,htmlBoldUnderlineItalic
-  sy region htmlBoldItalic          contained start="<i\>"      end="</i>"me=e-4      contains=@htmlTop,htmlBoldItalicUnderline
-  sy region htmlBoldItalic          contained start="<em\>"     end="</em>"me=e-5     contains=@htmlTop,htmlBoldItalicUnderline
-  sy region htmlBoldUnderlineItalic contained start="<i\>"      end="</i>"me=e-4      contains=@htmlTop
-  sy region htmlBoldUnderlineItalic contained start="<em\>"     end="</em>"me=e-5     contains=@htmlTop
-  sy region htmlBoldItalicUnderline contained start="<u\>"      end="</u>"me=e-4      contains=@htmlTop,htmlBoldUnderlineItalic
- 
-  sy region htmlUnderline                     start="<u\>"      end="</u>"me=e-4      contains=@htmlTop,htmlUnderlineBold,htmlUnderlineItalic
-  sy region htmlUnderlineBold       contained start="<b\>"      end="</b>"me=e-4      contains=@htmlTop,htmlUnderlineBoldItalic
-  sy region htmlUnderlineBold       contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop,htmlUnderlineBoldItalic
-  sy region htmlUnderlineItalic     contained start="<i\>"      end="</i>"me=e-4      contains=@htmlTop,htmlUnderlineItalicBold
-  sy region htmlUnderlineItalic     contained start="<em\>"     end="</em>"me=e-5     contains=@htmlTop,htmlUnderlineItalicBold
-  sy region htmlUnderlineItalicBold contained start="<b\>"      end="</b>"me=e-4      contains=@htmlTop
-  sy region htmlUnderlineItalicBold contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop
-  sy region htmlUnderlineBoldItalic contained start="<i\>"      end="</i>"me=e-4      contains=@htmlTop
-  sy region htmlUnderlineBoldItalic contained start="<em\>"     end="</em>"me=e-5     contains=@htmlTop
- 
-  sy region htmlItalic                        start="<i\>"      end="</i>"me=e-4      contains=@htmlTop,htmlItalicBold,htmlItalicUnderline
-  sy region htmlItalic                        start="<em\>"     end="</em>"me=e-5     contains=@htmlTop
-  sy region htmlItalicBold          contained start="<b\>"      end="</b>"me=e-4      contains=@htmlTop,htmlItalicBoldUnderline
-  sy region htmlItalicBold          contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop,htmlItalicBoldUnderline
-  sy region htmlItalicBoldUnderline contained start="<u\>"      end="</u>"me=e-4      contains=@htmlTop
-  sy region htmlItalicUnderline     contained start="<u\>"      end="</u>"me=e-4      contains=@htmlTop,htmlItalicUnderlineBold
-  sy region htmlItalicUnderlineBold contained start="<b\>"      end="</b>"me=e-4      contains=@htmlTop
-  sy region htmlItalicUnderlineBold contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop
- 
-  sy region htmlH1    start="<h1\>"    end="</h1>"me=e-5    contains=@htmlTop
-  sy region htmlH2    start="<h2\>"    end="</h2>"me=e-5    contains=@htmlTop
-  sy region htmlH3    start="<h3\>"    end="</h3>"me=e-5    contains=@htmlTop
-  sy region htmlH4    start="<h4\>"    end="</h4>"me=e-5    contains=@htmlTop
-  sy region htmlH5    start="<h5\>"    end="</h5>"me=e-5    contains=@htmlTop
-  sy region htmlH6    start="<h6\>"    end="</h6>"me=e-5    contains=@htmlTop
-endif
- 
- 
-" No htmlTop and wikiPre inside HTML preformatted areas, because
-" MediaWiki renders everything in there literally (HTML tags and
-" entities, too): <pre> tags work as the combination of <nowiki> and
-" the standard HTML <pre> tag: the content will preformatted, and it
-" will not be parsed, but shown as in the wikitext source.
-"
-" With wikiPre, indented lines would be rendered differently from
-" unindented lines.
-sy match htmlPreTag       /<pre>/         contains=htmlTag
-sy match htmlPreEndTag    /<\/pre>/       contains=htmlEndTag
-sy match wikiNowikiTag    /<nowiki>/      contains=htmlTag
-sy match wikiNowikiEndTag /<\/nowiki>/    contains=htmlEndTag
-sy match wikiSourceTag    /<source\s\+[^>]\+>/ contains=htmlTag
-sy match wikiSourceEndTag /<\/source>/    contains=htmlEndTag
-sy match wikiSyntaxHLTag    /<syntaxhighlight\s\+[^>]\+>/ contains=htmlTag
-sy match wikiSyntaxHLEndTag /<\/syntaxhighlight>/    contains=htmlEndTag
- 
-" Note: Cannot use 'start="<pre>"rs=e', so still have the <pre> tag
-" highlighted correctly via separate sy-match. Unfortunately, this will
-" also highlight <pre> tags inside the preformatted region. 
-sy region htmlPre    start="<pre>"                 end="<\/pre>"me=e-6    contains=htmlPreTag
-sy region wikiNowiki start="<nowiki>"              end="<\/nowiki>"me=e-9 contains=wikiNowikiTag
-sy region wikiSource start="<source\s\+[^>]\+>"         keepend end="<\/source>"me=e-9 contains=wikiSourceTag
-sy region wikiSyntaxHL start="<syntaxhighlight\s\+[^>]\+>" keepend end="<\/syntaxhighlight>"me=e-18 contains=wikiSyntaxHLTag
- 
-sy include @TeX syntax/tex.vim
-sy region wikiTeX matchgroup=htmlTag start="<math>" end="<\/math>"  contains=@texMathZoneGroup,wikiNowiki,wikiNowikiEndTag
-sy region wikiRef matchgroup=htmlTag start="<ref>"  end="<\/ref>"   contains=wikiNowiki,wikiNowikiEndTag
- 
-sy cluster wikiTop contains=@Spell,wikiLink,wikiNowiki,wikiNowikiEndTag
- 
-sy region wikiItalic        start=+'\@<!'''\@!+ end=+''+    oneline contains=@wikiTop,wikiItalicBold
-sy region wikiBold          start=+'''+         end=+'''+   oneline contains=@wikiTop,wikiBoldItalic
-sy region wikiBoldAndItalic start=+'''''+       end=+'''''+ oneline contains=@wikiTop
- 
-sy region wikiBoldItalic contained start=+'\@<!'''\@!+ end=+''+  oneline contains=@wikiTop
-sy region wikiItalicBold contained start=+'''+         end=+'''+ oneline contains=@wikiTop
- 
-sy region wikiH1 start="^="      end="="      oneline contains=@wikiTop
-sy region wikiH2 start="^=="     end="=="     oneline contains=@wikiTop
-sy region wikiH3 start="^==="    end="==="    oneline contains=@wikiTop
-sy region wikiH4 start="^===="   end="===="   oneline contains=@wikiTop
-sy region wikiH5 start="^====="  end="====="  oneline contains=@wikiTop
-sy region wikiH6 start="^======" end="======" oneline contains=@wikiTop
- 
-sy region wikiLink start="\[\[" end="\]\]\(s\|'s\|es\|ing\|\)" oneline contains=wikiLink,wikiNowiki,wikiNowikiEndTag
- 
-sy region wikiLink start="\[http:"   end="\]" oneline contains=wikiNowiki,wikiNowikiEndTag
-sy region wikiLink start="\[https:"  end="\]" oneline contains=wikiNowiki,wikiNowikiEndTag
-sy region wikiLink start="\[ftp:"    end="\]" oneline contains=wikiNowiki,wikiNowikiEndTag
-sy region wikiLink start="\[gopher:" end="\]" oneline contains=wikiNowiki,wikiNowikiEndTag
-sy region wikiLink start="\[news:"   end="\]" oneline contains=wikiNowiki,wikiNowikiEndTag
-sy region wikiLink start="\[mailto:" end="\]" oneline contains=wikiNowiki,wikiNowikiEndTag
- 
-sy region wikiTemplate start="{{" end="}}" contains=wikiNowiki,wikiNowikiEndTag
- 
-sy match wikiParaFormatChar /^[\:|\*|;|#]\+/
-sy match wikiParaFormatChar /^-----*/
-sy match wikiPre            /^\ .*$/         contains=wikiNowiki,wikiNowikiEndTag
- 
- 
-" HTML highlighting
- 
-if version < 508
-  command! -nargs=+ HtmlHiLink hi link     <args>
-else
-  command! -nargs=+ HtmlHiLink hi def link <args>
-endif
- 
-if version >= 508 || !exists("did_html_syn_inits")
-  HtmlHiLink htmlTag            Function
-  HtmlHiLink htmlEndTag         Identifier
-  HtmlHiLink htmlArg            Type
-  HtmlHiLink htmlTagName        htmlStatement
-  HtmlHiLink htmlSpecialTagName Exception
-  HtmlHiLink htmlValue          String
-  HtmlHiLink htmlSpecialChar    Special
- 
-  if !exists("html_no_rendering")
-    HtmlHiLink htmlTitle Title
-    HtmlHiLink htmlH1    htmlTitle
-    HtmlHiLink htmlH2    htmlTitle
-    HtmlHiLink htmlH3    htmlTitle
-    HtmlHiLink htmlH4    htmlTitle
-    HtmlHiLink htmlH5    htmlTitle
-    HtmlHiLink htmlH6    htmlTitle
- 
-    HtmlHiLink htmlPreProc          PreProc
-    HtmlHiLink htmlHead             htmlPreProc
-    HtmlHiLink htmlPreProcAttrName  htmlPreProc
-    HtmlHiLink htmlPreStmt          htmlPreProc
- 
-    HtmlHiLink htmlSpecial          Special
-    HtmlHiLink htmlCssDefinition    htmlSpecial
-    HtmlHiLink htmlEvent            htmlSpecial
-    HtmlHiLink htmlSpecialChar      htmlSpecial
- 
-    HtmlHiLink htmlComment          Comment
-    HtmlHiLink htmlCommentPart      htmlComment
-    HtmlHiLink htmlCssStyleComment  htmlComment
- 
-    HtmlHiLink htmlString           String
-    HtmlHiLink htmlPreAttr          htmlString
-    HtmlHiLink htmlValue            htmlString
- 
-    HtmlHiLink htmlError            Error
-    HtmlHiLink htmlBadArg           htmlError
-    HtmlHiLink htmlBadTag           htmlError
-    HtmlHiLink htmlCommentError     htmlError
-    HtmlHiLink htmlPreError         htmlError  
-    HtmlHiLink htmlPreProcAttrError htmlError
-    HtmlHiLink htmlTagError         htmlError
- 
-    HtmlHiLink htmlStatement        Statement
- 
-    HtmlHiLink htmlConstant         Constant
- 
-    HtmlHiLink htmlBoldItalicUnderline htmlBoldUnderlineItalic
-    HtmlHiLink htmlUnderlineItalicBold htmlBoldUnderlineItalic
-    HtmlHiLink htmlUnderlineBoldItalic htmlBoldUnderlineItalic
-    HtmlHiLink htmlItalicBoldUnderline htmlBoldUnderlineItalic
-    HtmlHiLink htmlItalicUnderlineBold htmlBoldUnderlineItalic
- 
-    HtmlHiLink htmlItalicBold          htmlBoldItalic
-    HtmlHiLink htmlItalicUnderline     htmlUnderlineItalic
-    HtmlHiLink htmlUnderlineBold       htmlBoldUnderline
- 
-    HtmlHiLink htmlLink Underlined
- 
-    if !exists("html_my_rendering")
-      hi def htmlBold                term=bold                  cterm=bold                  gui=bold
-      hi def htmlBoldUnderline       term=bold,underline        cterm=bold,underline        gui=bold,underline
-      hi def htmlBoldItalic          term=bold,italic           cterm=bold,italic           gui=bold,italic
-      hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline
-      hi def htmlUnderline           term=underline             cterm=underline             gui=underline
-      hi def htmlUnderlineItalic     term=italic,underline      cterm=italic,underline      gui=italic,underline
-      hi def htmlItalic              term=italic                cterm=italic                gui=italic
-    endif
- 
-  endif " !exists("html_no_rendering")
- 
-  if version < 508
-    let did_html_syn_inits = 1
-  endif
- 
-endif " version >= 508 || !exists("did_html_syn_inits")
- 
-" Wiki highlighting
- 
-HtmlHiLink wikiItalic        htmlItalic
-HtmlHiLink wikiBold          htmlBold
-HtmlHiLink wikiBoldItalic    htmlBoldItalic
-HtmlHiLink wikiItalicBold    htmlBoldItalic
-HtmlHiLink wikiBoldAndItalic htmlBoldItalic
- 
-HtmlHiLink wikiH1 htmlTitle
-HtmlHiLink wikiH2 htmlTitle
-HtmlHiLink wikiH3 htmlTitle
-HtmlHiLink wikiH4 htmlTitle
-HtmlHiLink wikiH5 htmlTitle
-HtmlHiLink wikiH6 htmlTitle
- 
-HtmlHiLink wikiLink           htmlLink
-HtmlHiLink wikiTemplate       htmlSpecial
-HtmlHiLink wikiParaFormatChar htmlSpecial
-HtmlHiLink wikiPre            htmlConstant
-HtmlHiLink wikiRef            htmlComment
- 
-HtmlHiLink wikiSource         wikiPre
-HtmlHiLink wikiSyntaxHL       wikiPre
- 
- 
-let b:current_syntax = "html"
- 
-delcommand HtmlHiLink
- 
-if main_syntax == "html"
-  unlet main_syntax
-endif
- 
-" vim: set et sts=2 sw=2:
diff --git a/vim/syntax/nginx.vim b/vim/syntax/nginx.vim
deleted file mode 100644
index ccd4768..0000000
--- a/vim/syntax/nginx.vim
+++ /dev/null
@@ -1,664 +0,0 @@
-" Vim syntax file
-" Language: nginx.conf
-
-if exists("b:current_syntax")
-  finish
-end
-
-setlocal iskeyword+=.
-setlocal iskeyword+=/
-setlocal iskeyword+=:
-
-syn match ngxVariable '\$\w\w*'
-syn match ngxVariableBlock '\$\w\w*' contained
-syn match ngxVariableString '\$\w\w*' contained
-syn region ngxBlock start=+^+ end=+{+ contains=ngxComment,ngxDirectiveBlock,ngxVariableBlock,ngxString oneline
-syn region ngxString start=+"+ end=+"+ skip=+\\\\\|\\"+ contains=ngxVariableString oneline
-syn region ngxString start=+'+ end=+'+ skip=+\\\\\|\\'+ contains=ngxVariableString oneline
-syn match ngxComment ' *#.*$'
-
-syn keyword ngxBoolean on
-syn keyword ngxBoolean off
-
-syn keyword ngxDirectiveBlock http         contained
-syn keyword ngxDirectiveBlock mail         contained
-syn keyword ngxDirectiveBlock events       contained
-syn keyword ngxDirectiveBlock server       contained
-syn keyword ngxDirectiveBlock types        contained
-syn keyword ngxDirectiveBlock location     contained
-syn keyword ngxDirectiveBlock upstream     contained
-syn keyword ngxDirectiveBlock charset_map  contained
-syn keyword ngxDirectiveBlock limit_except contained
-syn keyword ngxDirectiveBlock if           contained
-syn keyword ngxDirectiveBlock geo          contained
-syn keyword ngxDirectiveBlock map          contained
-
-syn keyword ngxDirectiveImportant include
-syn keyword ngxDirectiveImportant root
-syn keyword ngxDirectiveImportant server
-syn keyword ngxDirectiveImportant server_name
-syn keyword ngxDirectiveImportant listen
-syn keyword ngxDirectiveImportant internal
-syn keyword ngxDirectiveImportant proxy_pass
-syn keyword ngxDirectiveImportant memcached_pass
-syn keyword ngxDirectiveImportant fastcgi_pass
-syn keyword ngxDirectiveImportant try_files
-
-syn keyword ngxDirectiveControl break
-syn keyword ngxDirectiveControl return
-syn keyword ngxDirectiveControl rewrite
-syn keyword ngxDirectiveControl set
-
-syn keyword ngxDirectiveError error_page
-syn keyword ngxDirectiveError post_action
-
-syn keyword ngxDirectiveDeprecated connections
-syn keyword ngxDirectiveDeprecated imap
-syn keyword ngxDirectiveDeprecated open_file_cache_retest
-syn keyword ngxDirectiveDeprecated optimize_server_names
-syn keyword ngxDirectiveDeprecated satisfy_any
-
-syn keyword ngxDirective accept_mutex
-syn keyword ngxDirective accept_mutex_delay
-syn keyword ngxDirective access_log
-syn keyword ngxDirective add_after_body
-syn keyword ngxDirective add_before_body
-syn keyword ngxDirective add_header
-syn keyword ngxDirective addition_types
-syn keyword ngxDirective aio
-syn keyword ngxDirective alias
-syn keyword ngxDirective allow
-syn keyword ngxDirective ancient_browser
-syn keyword ngxDirective ancient_browser_value
-syn keyword ngxDirective auth_basic
-syn keyword ngxDirective auth_basic_user_file
-syn keyword ngxDirective auth_http
-syn keyword ngxDirective auth_http_header
-syn keyword ngxDirective auth_http_timeout
-syn keyword ngxDirective autoindex
-syn keyword ngxDirective autoindex_exact_size
-syn keyword ngxDirective autoindex_localtime
-syn keyword ngxDirective charset
-syn keyword ngxDirective charset_types
-syn keyword ngxDirective client_body_buffer_size
-syn keyword ngxDirective client_body_in_file_only
-syn keyword ngxDirective client_body_in_single_buffer
-syn keyword ngxDirective client_body_temp_path
-syn keyword ngxDirective client_body_timeout
-syn keyword ngxDirective client_header_buffer_size
-syn keyword ngxDirective client_header_timeout
-syn keyword ngxDirective client_max_body_size
-syn keyword ngxDirective connection_pool_size
-syn keyword ngxDirective create_full_put_path
-syn keyword ngxDirective daemon
-syn keyword ngxDirective dav_access
-syn keyword ngxDirective dav_methods
-syn keyword ngxDirective debug_connection
-syn keyword ngxDirective debug_points
-syn keyword ngxDirective default_type
-syn keyword ngxDirective degradation
-syn keyword ngxDirective degrade
-syn keyword ngxDirective deny
-syn keyword ngxDirective devpoll_changes
-syn keyword ngxDirective devpoll_events
-syn keyword ngxDirective directio
-syn keyword ngxDirective directio_alignment
-syn keyword ngxDirective empty_gif
-syn keyword ngxDirective env
-syn keyword ngxDirective epoll_events
-syn keyword ngxDirective error_log
-syn keyword ngxDirective eventport_events
-syn keyword ngxDirective expires
-syn keyword ngxDirective fastcgi_bind
-syn keyword ngxDirective fastcgi_buffer_size
-syn keyword ngxDirective fastcgi_buffers
-syn keyword ngxDirective fastcgi_busy_buffers_size
-syn keyword ngxDirective fastcgi_cache
-syn keyword ngxDirective fastcgi_cache_key
-syn keyword ngxDirective fastcgi_cache_methods
-syn keyword ngxDirective fastcgi_cache_min_uses
-syn keyword ngxDirective fastcgi_cache_path
-syn keyword ngxDirective fastcgi_cache_use_stale
-syn keyword ngxDirective fastcgi_cache_valid
-syn keyword ngxDirective fastcgi_catch_stderr
-syn keyword ngxDirective fastcgi_connect_timeout
-syn keyword ngxDirective fastcgi_hide_header
-syn keyword ngxDirective fastcgi_ignore_client_abort
-syn keyword ngxDirective fastcgi_ignore_headers
-syn keyword ngxDirective fastcgi_index
-syn keyword ngxDirective fastcgi_intercept_errors
-syn keyword ngxDirective fastcgi_max_temp_file_size
-syn keyword ngxDirective fastcgi_next_upstream
-syn keyword ngxDirective fastcgi_param
-syn keyword ngxDirective fastcgi_pass_header
-syn keyword ngxDirective fastcgi_pass_request_body
-syn keyword ngxDirective fastcgi_pass_request_headers
-syn keyword ngxDirective fastcgi_read_timeout
-syn keyword ngxDirective fastcgi_send_lowat
-syn keyword ngxDirective fastcgi_send_timeout
-syn keyword ngxDirective fastcgi_split_path_info
-syn keyword ngxDirective fastcgi_store
-syn keyword ngxDirective fastcgi_store_access
-syn keyword ngxDirective fastcgi_temp_file_write_size
-syn keyword ngxDirective fastcgi_temp_path
-syn keyword ngxDirective fastcgi_upstream_fail_timeout
-syn keyword ngxDirective fastcgi_upstream_max_fails
-syn keyword ngxDirective flv
-syn keyword ngxDirective geoip_city
-syn keyword ngxDirective geoip_country
-syn keyword ngxDirective google_perftools_profiles
-syn keyword ngxDirective gzip
-syn keyword ngxDirective gzip_buffers
-syn keyword ngxDirective gzip_comp_level
-syn keyword ngxDirective gzip_disable
-syn keyword ngxDirective gzip_hash
-syn keyword ngxDirective gzip_http_version
-syn keyword ngxDirective gzip_min_length
-syn keyword ngxDirective gzip_no_buffer
-syn keyword ngxDirective gzip_proxied
-syn keyword ngxDirective gzip_static
-syn keyword ngxDirective gzip_types
-syn keyword ngxDirective gzip_vary
-syn keyword ngxDirective gzip_window
-syn keyword ngxDirective if_modified_since
-syn keyword ngxDirective ignore_invalid_headers
-syn keyword ngxDirective image_filter
-syn keyword ngxDirective image_filter_buffer
-syn keyword ngxDirective image_filter_jpeg_quality
-syn keyword ngxDirective image_filter_transparency
-syn keyword ngxDirective imap_auth
-syn keyword ngxDirective imap_capabilities
-syn keyword ngxDirective imap_client_buffer
-syn keyword ngxDirective index
-syn keyword ngxDirective ip_hash
-syn keyword ngxDirective keepalive_requests
-syn keyword ngxDirective keepalive_timeout
-syn keyword ngxDirective kqueue_changes
-syn keyword ngxDirective kqueue_events
-syn keyword ngxDirective large_client_header_buffers
-syn keyword ngxDirective limit_conn
-syn keyword ngxDirective limit_conn_log_level
-syn keyword ngxDirective limit_rate
-syn keyword ngxDirective limit_rate_after
-syn keyword ngxDirective limit_req
-syn keyword ngxDirective limit_req_log_level
-syn keyword ngxDirective limit_req_zone
-syn keyword ngxDirective limit_zone
-syn keyword ngxDirective lingering_time
-syn keyword ngxDirective lingering_timeout
-syn keyword ngxDirective lock_file
-syn keyword ngxDirective log_format
-syn keyword ngxDirective log_not_found
-syn keyword ngxDirective log_subrequest
-syn keyword ngxDirective map_hash_bucket_size
-syn keyword ngxDirective map_hash_max_size
-syn keyword ngxDirective master_process
-syn keyword ngxDirective memcached_bind
-syn keyword ngxDirective memcached_buffer_size
-syn keyword ngxDirective memcached_connect_timeout
-syn keyword ngxDirective memcached_next_upstream
-syn keyword ngxDirective memcached_read_timeout
-syn keyword ngxDirective memcached_send_timeout
-syn keyword ngxDirective memcached_upstream_fail_timeout
-syn keyword ngxDirective memcached_upstream_max_fails
-syn keyword ngxDirective merge_slashes
-syn keyword ngxDirective min_delete_depth
-syn keyword ngxDirective modern_browser
-syn keyword ngxDirective modern_browser_value
-syn keyword ngxDirective msie_padding
-syn keyword ngxDirective msie_refresh
-syn keyword ngxDirective multi_accept
-syn keyword ngxDirective open_file_cache
-syn keyword ngxDirective open_file_cache_errors
-syn keyword ngxDirective open_file_cache_events
-syn keyword ngxDirective open_file_cache_min_uses
-syn keyword ngxDirective open_file_cache_valid
-syn keyword ngxDirective open_log_file_cache
-syn keyword ngxDirective output_buffers
-syn keyword ngxDirective override_charset
-syn keyword ngxDirective perl
-syn keyword ngxDirective perl_modules
-syn keyword ngxDirective perl_require
-syn keyword ngxDirective perl_set
-syn keyword ngxDirective pid
-syn keyword ngxDirective pop3_auth
-syn keyword ngxDirective pop3_capabilities
-syn keyword ngxDirective port_in_redirect
-syn keyword ngxDirective postpone_gzipping
-syn keyword ngxDirective postpone_output
-syn keyword ngxDirective protocol
-syn keyword ngxDirective proxy
-syn keyword ngxDirective proxy_bind
-syn keyword ngxDirective proxy_buffer
-syn keyword ngxDirective proxy_buffer_size
-syn keyword ngxDirective proxy_buffering
-syn keyword ngxDirective proxy_buffers
-syn keyword ngxDirective proxy_busy_buffers_size
-syn keyword ngxDirective proxy_cache
-syn keyword ngxDirective proxy_cache_key
-syn keyword ngxDirective proxy_cache_methods
-syn keyword ngxDirective proxy_cache_min_uses
-syn keyword ngxDirective proxy_cache_path
-syn keyword ngxDirective proxy_cache_use_stale
-syn keyword ngxDirective proxy_cache_valid
-syn keyword ngxDirective proxy_connect_timeout
-syn keyword ngxDirective proxy_headers_hash_bucket_size
-syn keyword ngxDirective proxy_headers_hash_max_size
-syn keyword ngxDirective proxy_hide_header
-syn keyword ngxDirective proxy_ignore_client_abort
-syn keyword ngxDirective proxy_ignore_headers
-syn keyword ngxDirective proxy_intercept_errors
-syn keyword ngxDirective proxy_max_temp_file_size
-syn keyword ngxDirective proxy_method
-syn keyword ngxDirective proxy_next_upstream
-syn keyword ngxDirective proxy_pass_error_message
-syn keyword ngxDirective proxy_pass_header
-syn keyword ngxDirective proxy_pass_request_body
-syn keyword ngxDirective proxy_pass_request_headers
-syn keyword ngxDirective proxy_read_timeout
-syn keyword ngxDirective proxy_redirect
-syn keyword ngxDirective proxy_send_lowat
-syn keyword ngxDirective proxy_send_timeout
-syn keyword ngxDirective proxy_set_body
-syn keyword ngxDirective proxy_set_header
-syn keyword ngxDirective proxy_ssl_session_reuse
-syn keyword ngxDirective proxy_store
-syn keyword ngxDirective proxy_store_access
-syn keyword ngxDirective proxy_temp_file_write_size
-syn keyword ngxDirective proxy_temp_path
-syn keyword ngxDirective proxy_timeout
-syn keyword ngxDirective proxy_upstream_fail_timeout
-syn keyword ngxDirective proxy_upstream_max_fails
-syn keyword ngxDirective random_index
-syn keyword ngxDirective read_ahead
-syn keyword ngxDirective real_ip_header
-syn keyword ngxDirective recursive_error_pages
-syn keyword ngxDirective request_pool_size
-syn keyword ngxDirective reset_timedout_connection
-syn keyword ngxDirective resolver
-syn keyword ngxDirective resolver_timeout
-syn keyword ngxDirective rewrite_log
-syn keyword ngxDirective rtsig_overflow_events
-syn keyword ngxDirective rtsig_overflow_test
-syn keyword ngxDirective rtsig_overflow_threshold
-syn keyword ngxDirective rtsig_signo
-syn keyword ngxDirective satisfy
-syn keyword ngxDirective secure_link_secret
-syn keyword ngxDirective send_lowat
-syn keyword ngxDirective send_timeout
-syn keyword ngxDirective sendfile
-syn keyword ngxDirective sendfile_max_chunk
-syn keyword ngxDirective server_name_in_redirect
-syn keyword ngxDirective server_names_hash_bucket_size
-syn keyword ngxDirective server_names_hash_max_size
-syn keyword ngxDirective server_tokens
-syn keyword ngxDirective set_real_ip_from
-syn keyword ngxDirective smtp_auth
-syn keyword ngxDirective smtp_capabilities
-syn keyword ngxDirective smtp_client_buffer
-syn keyword ngxDirective smtp_greeting_delay
-syn keyword ngxDirective so_keepalive
-syn keyword ngxDirective source_charset
-syn keyword ngxDirective ssi
-syn keyword ngxDirective ssi_ignore_recycled_buffers
-syn keyword ngxDirective ssi_min_file_chunk
-syn keyword ngxDirective ssi_silent_errors
-syn keyword ngxDirective ssi_types
-syn keyword ngxDirective ssi_value_length
-syn keyword ngxDirective ssl
-syn keyword ngxDirective ssl_certificate
-syn keyword ngxDirective ssl_certificate_key
-syn keyword ngxDirective ssl_ciphers
-syn keyword ngxDirective ssl_client_certificate
-syn keyword ngxDirective ssl_crl
-syn keyword ngxDirective ssl_dhparam
-syn keyword ngxDirective ssl_engine
-syn keyword ngxDirective ssl_prefer_server_ciphers
-syn keyword ngxDirective ssl_protocols
-syn keyword ngxDirective ssl_session_cache
-syn keyword ngxDirective ssl_session_timeout
-syn keyword ngxDirective ssl_verify_client
-syn keyword ngxDirective ssl_verify_depth
-syn keyword ngxDirective starttls
-syn keyword ngxDirective stub_status
-syn keyword ngxDirective sub_filter
-syn keyword ngxDirective sub_filter_once
-syn keyword ngxDirective sub_filter_types
-syn keyword ngxDirective tcp_nodelay
-syn keyword ngxDirective tcp_nopush
-syn keyword ngxDirective thread_stack_size
-syn keyword ngxDirective timeout
-syn keyword ngxDirective timer_resolution
-syn keyword ngxDirective types_hash_bucket_size
-syn keyword ngxDirective types_hash_max_size
-syn keyword ngxDirective underscores_in_headers
-syn keyword ngxDirective uninitialized_variable_warn
-syn keyword ngxDirective use
-syn keyword ngxDirective user
-syn keyword ngxDirective userid
-syn keyword ngxDirective userid_domain
-syn keyword ngxDirective userid_expires
-syn keyword ngxDirective userid_mark
-syn keyword ngxDirective userid_name
-syn keyword ngxDirective userid_p3p
-syn keyword ngxDirective userid_path
-syn keyword ngxDirective userid_service
-syn keyword ngxDirective valid_referers
-syn keyword ngxDirective variables_hash_bucket_size
-syn keyword ngxDirective variables_hash_max_size
-syn keyword ngxDirective worker_connections
-syn keyword ngxDirective worker_cpu_affinity
-syn keyword ngxDirective worker_priority
-syn keyword ngxDirective worker_processes
-syn keyword ngxDirective worker_rlimit_core
-syn keyword ngxDirective worker_rlimit_nofile
-syn keyword ngxDirective worker_rlimit_sigpending
-syn keyword ngxDirective worker_threads
-syn keyword ngxDirective working_directory
-syn keyword ngxDirective xclient
-syn keyword ngxDirective xml_entities
-syn keyword ngxDirective xslt_stylesheet
-syn keyword ngxDirective xslt_types
-
-" 3rd party module list:
-" http://wiki.nginx.org/Nginx3rdPartyModules
-
-" Accept Language Module <http://wiki.nginx.org/NginxAcceptLanguageModule>
-" Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
-syn keyword ngxDirectiveThirdParty set_from_accept_language
-
-" Access Key Module <http://wiki.nginx.org/NginxHttpAccessKeyModule>
-" Denies access unless the request URL contains an access key. 
-syn keyword ngxDirectiveThirdParty accesskey
-syn keyword ngxDirectiveThirdParty accesskey_arg
-syn keyword ngxDirectiveThirdParty accesskey_hashmethod
-syn keyword ngxDirectiveThirdParty accesskey_signature
-
-" Auth PAM Module <http://web.iti.upv.es/~sto/nginx/>
-" HTTP Basic Authentication using PAM.
-syn keyword ngxDirectiveThirdParty auth_pam
-syn keyword ngxDirectiveThirdParty auth_pam_service_name
-
-" Cache Purge Module <http://labs.frickle.com/nginx_ngx_cache_purge/>
-" Module adding ability to purge content from FastCGI and proxy caches.
-syn keyword ngxDirectiveThirdParty fastcgi_cache_purge
-syn keyword ngxDirectiveThirdParty proxy_cache_purge
-
-" Chunkin Module <http://wiki.nginx.org/NginxHttpChunkinModule>
-" HTTP 1.1 chunked-encoding request body support for Nginx.
-syn keyword ngxDirectiveThirdParty chunkin
-syn keyword ngxDirectiveThirdParty chunkin_keepalive
-syn keyword ngxDirectiveThirdParty chunkin_max_chunks_per_buf
-syn keyword ngxDirectiveThirdParty chunkin_resume
-
-" Circle GIF Module <http://wiki.nginx.org/NginxHttpCircleGifModule>
-" Generates simple circle images with the colors and size specified in the URL.
-syn keyword ngxDirectiveThirdParty circle_gif
-syn keyword ngxDirectiveThirdParty circle_gif_max_radius
-syn keyword ngxDirectiveThirdParty circle_gif_min_radius
-syn keyword ngxDirectiveThirdParty circle_gif_step_radius
-
-" Drizzle Module <http://github.com/chaoslawful/drizzle-nginx-module>
-" Make nginx talk directly to mysql, drizzle, and sqlite3 by libdrizzle.
-syn keyword ngxDirectiveThirdParty drizzle_connect_timeout
-syn keyword ngxDirectiveThirdParty drizzle_dbname
-syn keyword ngxDirectiveThirdParty drizzle_keepalive
-syn keyword ngxDirectiveThirdParty drizzle_module_header
-syn keyword ngxDirectiveThirdParty drizzle_pass
-syn keyword ngxDirectiveThirdParty drizzle_query
-syn keyword ngxDirectiveThirdParty drizzle_recv_cols_timeout
-syn keyword ngxDirectiveThirdParty drizzle_recv_rows_timeout
-syn keyword ngxDirectiveThirdParty drizzle_send_query_timeout
-syn keyword ngxDirectiveThirdParty drizzle_server
-
-" Echo Module <http://wiki.nginx.org/NginxHttpEchoModule>
-" Brings 'echo', 'sleep', 'time', 'exec' and more shell-style goodies to Nginx config file.
-syn keyword ngxDirectiveThirdParty echo
-syn keyword ngxDirectiveThirdParty echo_after_body
-syn keyword ngxDirectiveThirdParty echo_before_body
-syn keyword ngxDirectiveThirdParty echo_blocking_sleep
-syn keyword ngxDirectiveThirdParty echo_duplicate
-syn keyword ngxDirectiveThirdParty echo_end
-syn keyword ngxDirectiveThirdParty echo_exec
-syn keyword ngxDirectiveThirdParty echo_flush
-syn keyword ngxDirectiveThirdParty echo_foreach_split
-syn keyword ngxDirectiveThirdParty echo_location
-syn keyword ngxDirectiveThirdParty echo_location_async
-syn keyword ngxDirectiveThirdParty echo_read_request_body
-syn keyword ngxDirectiveThirdParty echo_request_body
-syn keyword ngxDirectiveThirdParty echo_reset_timer
-syn keyword ngxDirectiveThirdParty echo_sleep
-syn keyword ngxDirectiveThirdParty echo_subrequest
-syn keyword ngxDirectiveThirdParty echo_subrequest_async
-
-" Events Module <http://docs.dutov.org/nginx_modules_events_en.html>
-" Privides options for start/stop events.
-syn keyword ngxDirectiveThirdParty on_start
-syn keyword ngxDirectiveThirdParty on_stop
-
-" EY Balancer Module <http://github.com/ry/nginx-ey-balancer>
-" Adds a request queue to Nginx that allows the limiting of concurrent requests passed to the upstream.
-syn keyword ngxDirectiveThirdParty max_connections
-syn keyword ngxDirectiveThirdParty max_connections_max_queue_length
-syn keyword ngxDirectiveThirdParty max_connections_queue_timeout
-
-" Fancy Indexes Module <https://connectical.com/projects/ngx-fancyindex/wiki>
-" Like the built-in autoindex module, but fancier.
-syn keyword ngxDirectiveThirdParty fancyindex
-syn keyword ngxDirectiveThirdParty fancyindex_exact_size
-syn keyword ngxDirectiveThirdParty fancyindex_footer
-syn keyword ngxDirectiveThirdParty fancyindex_header
-syn keyword ngxDirectiveThirdParty fancyindex_localtime
-syn keyword ngxDirectiveThirdParty fancyindex_readme
-syn keyword ngxDirectiveThirdParty fancyindex_readme_mode
-
-" GeoIP Module (DEPRECATED) <http://wiki.nginx.org/NginxHttp3rdPartyGeoIPModule>
-" Country code lookups via the MaxMind GeoIP API.
-syn keyword ngxDirectiveThirdParty geoip_country_file
-
-" Headers More Module <http://wiki.nginx.org/NginxHttpHeadersMoreModule>
-" Set and clear input and output headers...more than "add"!
-syn keyword ngxDirectiveThirdParty more_clear_headers
-syn keyword ngxDirectiveThirdParty more_clear_input_headers
-syn keyword ngxDirectiveThirdParty more_set_headers
-syn keyword ngxDirectiveThirdParty more_set_input_headers
-
-" HTTP Push Module <http://pushmodule.slact.net/>
-" Turn Nginx into an adept long-polling HTTP Push (Comet) server.
-syn keyword ngxDirectiveThirdParty push_buffer_size
-syn keyword ngxDirectiveThirdParty push_listener
-syn keyword ngxDirectiveThirdParty push_message_timeout
-syn keyword ngxDirectiveThirdParty push_queue_messages
-syn keyword ngxDirectiveThirdParty push_sender
-
-" HTTP Redis Module <http://people.FreeBSD.ORG/~osa/ngx_http_redis-0.3.1.tar.gz>>
-" Redis <http://code.google.com/p/redis/> support.>
-syn keyword ngxDirectiveThirdParty redis_bind
-syn keyword ngxDirectiveThirdParty redis_buffer_size
-syn keyword ngxDirectiveThirdParty redis_connect_timeout
-syn keyword ngxDirectiveThirdParty redis_next_upstream
-syn keyword ngxDirectiveThirdParty redis_pass
-syn keyword ngxDirectiveThirdParty redis_read_timeout
-syn keyword ngxDirectiveThirdParty redis_send_timeout
-
-" HTTP JavaScript Module <http://wiki.github.com/kung-fu-tzu/ngx_http_js_module>
-" Embedding SpiderMonkey. Nearly full port on Perl module.
-syn keyword ngxDirectiveThirdParty js
-syn keyword ngxDirectiveThirdParty js_filter
-syn keyword ngxDirectiveThirdParty js_filter_types
-syn keyword ngxDirectiveThirdParty js_load
-syn keyword ngxDirectiveThirdParty js_maxmem
-syn keyword ngxDirectiveThirdParty js_require
-syn keyword ngxDirectiveThirdParty js_set
-syn keyword ngxDirectiveThirdParty js_utf8
-
-" Log Request Speed <http://wiki.nginx.org/NginxHttpLogRequestSpeed>
-" Log the time it took to process each request.
-syn keyword ngxDirectiveThirdParty log_request_speed_filter
-syn keyword ngxDirectiveThirdParty log_request_speed_filter_timeout
-
-" Memc Module <http://wiki.nginx.org/NginxHttpMemcModule>
-" An extended version of the standard memcached module that supports set, add, delete, and many more memcached commands.
-syn keyword ngxDirectiveThirdParty memc_buffer_size
-syn keyword ngxDirectiveThirdParty memc_cmds_allowed
-syn keyword ngxDirectiveThirdParty memc_connect_timeout
-syn keyword ngxDirectiveThirdParty memc_flags_to_last_modified
-syn keyword ngxDirectiveThirdParty memc_next_upstream
-syn keyword ngxDirectiveThirdParty memc_pass
-syn keyword ngxDirectiveThirdParty memc_read_timeout
-syn keyword ngxDirectiveThirdParty memc_send_timeout
-syn keyword ngxDirectiveThirdParty memc_upstream_fail_timeout
-syn keyword ngxDirectiveThirdParty memc_upstream_max_fails
-
-" Mogilefs Module <http://www.grid.net.ru/nginx/mogilefs.en.html>
-" Implements a MogileFS client, provides a replace to the Perlbal reverse proxy of the original MogileFS.
-syn keyword ngxDirectiveThirdParty mogilefs_connect_timeout
-syn keyword ngxDirectiveThirdParty mogilefs_domain
-syn keyword ngxDirectiveThirdParty mogilefs_methods
-syn keyword ngxDirectiveThirdParty mogilefs_noverify
-syn keyword ngxDirectiveThirdParty mogilefs_pass
-syn keyword ngxDirectiveThirdParty mogilefs_read_timeout
-syn keyword ngxDirectiveThirdParty mogilefs_send_timeout
-syn keyword ngxDirectiveThirdParty mogilefs_tracker
-
-" MP4 Streaming Lite Module <http://wiki.nginx.org/NginxMP4StreamingLite>
-" Will seek to a certain time within H.264/MP4 files when provided with a 'start' parameter in the URL. 
-syn keyword ngxDirectiveThirdParty mp4
-
-" Nginx Notice Module <http://xph.us/software/nginx-notice/>
-" Serve static file to POST requests.
-syn keyword ngxDirectiveThirdParty notice
-syn keyword ngxDirectiveThirdParty notice_type
-
-" Phusion Passenger <http://www.modrails.com/documentation.html>
-" Easy and robust deployment of Ruby on Rails application on Apache and Nginx webservers.
-syn keyword ngxDirectiveThirdParty passenger_base_uri
-syn keyword ngxDirectiveThirdParty passenger_default_user
-syn keyword ngxDirectiveThirdParty passenger_enabled
-syn keyword ngxDirectiveThirdParty passenger_log_level
-syn keyword ngxDirectiveThirdParty passenger_max_instances_per_app
-syn keyword ngxDirectiveThirdParty passenger_max_pool_size
-syn keyword ngxDirectiveThirdParty passenger_pool_idle_time
-syn keyword ngxDirectiveThirdParty passenger_root
-syn keyword ngxDirectiveThirdParty passenger_ruby
-syn keyword ngxDirectiveThirdParty passenger_use_global_queue
-syn keyword ngxDirectiveThirdParty passenger_user_switching
-syn keyword ngxDirectiveThirdParty rack_env
-syn keyword ngxDirectiveThirdParty rails_app_spawner_idle_time
-syn keyword ngxDirectiveThirdParty rails_env
-syn keyword ngxDirectiveThirdParty rails_framework_spawner_idle_time
-syn keyword ngxDirectiveThirdParty rails_spawn_method
-
-" RDS JSON Module <http://github.com/agentzh/rds-json-nginx-module>
-" Help ngx_drizzle and other DBD modules emit JSON data.
-syn keyword ngxDirectiveThirdParty rds_json
-syn keyword ngxDirectiveThirdParty rds_json_content_type
-syn keyword ngxDirectiveThirdParty rds_json_format
-syn keyword ngxDirectiveThirdParty rds_json_ret
-
-" RRD Graph Module <http://wiki.nginx.org/NginxNgx_rrd_graph>
-" This module provides an HTTP interface to RRDtool's graphing facilities.
-syn keyword ngxDirectiveThirdParty rrd_graph
-syn keyword ngxDirectiveThirdParty rrd_graph_root
-
-" Secure Download <http://wiki.nginx.org/NginxHttpSecureDownload>
-" Create expiring links.
-syn keyword ngxDirectiveThirdParty secure_download
-syn keyword ngxDirectiveThirdParty secure_download_fail_location
-syn keyword ngxDirectiveThirdParty secure_download_path_mode
-syn keyword ngxDirectiveThirdParty secure_download_secret
-
-" SlowFS Cache Module <http://labs.frickle.com/nginx_ngx_slowfs_cache/>
-" Module adding ability to cache static files.
-syn keyword ngxDirectiveThirdParty slowfs_big_file_size
-syn keyword ngxDirectiveThirdParty slowfs_cache
-syn keyword ngxDirectiveThirdParty slowfs_cache_key
-syn keyword ngxDirectiveThirdParty slowfs_cache_min_uses
-syn keyword ngxDirectiveThirdParty slowfs_cache_path
-syn keyword ngxDirectiveThirdParty slowfs_cache_purge
-syn keyword ngxDirectiveThirdParty slowfs_cache_valid
-syn keyword ngxDirectiveThirdParty slowfs_temp_path
-
-" Strip Module <http://wiki.nginx.org/NginxHttpStripModule>
-" Whitespace remover.
-syn keyword ngxDirectiveThirdParty strip
-
-" Substitutions Module <http://wiki.nginx.org/NginxHttpSubsModule>
-" A filter module which can do both regular expression and fixed string substitutions on response bodies.
-syn keyword ngxDirectiveThirdParty subs_filter
-syn keyword ngxDirectiveThirdParty subs_filter_types
-
-" Supervisord Module <http://labs.frickle.com/nginx_ngx_supervisord/>
-" Module providing nginx with API to communicate with supervisord and manage (start/stop) backends on-demand.
-syn keyword ngxDirectiveThirdParty supervisord
-syn keyword ngxDirectiveThirdParty supervisord_inherit_backend_status
-syn keyword ngxDirectiveThirdParty supervisord_name
-syn keyword ngxDirectiveThirdParty supervisord_start
-syn keyword ngxDirectiveThirdParty supervisord_stop
-
-" Upload Module <http://www.grid.net.ru/nginx/upload.en.html>
-" Parses multipart/form-data allowing arbitrary handling of uploaded files.
-syn keyword ngxDirectiveThirdParty upload_aggregate_form_field
-syn keyword ngxDirectiveThirdParty upload_buffer_size
-syn keyword ngxDirectiveThirdParty upload_cleanup
-syn keyword ngxDirectiveThirdParty upload_limit_rate
-syn keyword ngxDirectiveThirdParty upload_max_file_size
-syn keyword ngxDirectiveThirdParty upload_max_output_body_len
-syn keyword ngxDirectiveThirdParty upload_max_part_header_len
-syn keyword ngxDirectiveThirdParty upload_pass
-syn keyword ngxDirectiveThirdParty upload_pass_args
-syn keyword ngxDirectiveThirdParty upload_pass_form_field
-syn keyword ngxDirectiveThirdParty upload_set_form_field
-syn keyword ngxDirectiveThirdParty upload_store
-syn keyword ngxDirectiveThirdParty upload_store_access
-
-" Upload Progress Module <http://wiki.nginx.org/NginxHttpUploadProgressModule>
-" Tracks and reports upload progress.
-syn keyword ngxDirectiveThirdParty report_uploads
-syn keyword ngxDirectiveThirdParty track_uploads
-syn keyword ngxDirectiveThirdParty upload_progress
-syn keyword ngxDirectiveThirdParty upload_progress_content_type
-syn keyword ngxDirectiveThirdParty upload_progress_header
-syn keyword ngxDirectiveThirdParty upload_progress_json_output
-syn keyword ngxDirectiveThirdParty upload_progress_template
-
-" Upstream Fair Balancer <http://wiki.nginx.org/NginxHttpUpstreamFairModule>
-" Sends an incoming request to the least-busy backend server, rather than distributing requests round-robin.
-syn keyword ngxDirectiveThirdParty fair
-syn keyword ngxDirectiveThirdParty upstream_fair_shm_size
-
-" Upstream Consistent Hash <http://wiki.nginx.org/NginxHttpUpstreamConsistentHash>
-" Select backend based on Consistent hash ring.
-syn keyword ngxDirectiveThirdParty consistent_hash
-
-" Upstream Hash Module <http://wiki.nginx.org/NginxHttpUpstreamRequestHashModule>
-" Provides simple upstream load distribution by hashing a configurable variable.
-syn keyword ngxDirectiveThirdParty hash
-syn keyword ngxDirectiveThirdParty hash_again
-
-" XSS Module <http://github.com/agentzh/xss-nginx-module>
-" Native support for cross-site scripting (XSS) in an nginx.
-syn keyword ngxDirectiveThirdParty xss_callback_arg
-syn keyword ngxDirectiveThirdParty xss_get
-syn keyword ngxDirectiveThirdParty xss_input_types
-syn keyword ngxDirectiveThirdParty xss_output_type
-
-" highlight
-
-hi link ngxComment Comment
-hi link ngxVariable Identifier
-hi link ngxVariableBlock Identifier
-hi link ngxVariableString PreProc
-hi link ngxBlock Normal
-hi link ngxString String
-
-hi link ngxBoolean Boolean
-hi link ngxDirectiveBlock Statement
-hi link ngxDirectiveImportant Type
-hi link ngxDirectiveControl Keyword
-hi link ngxDirectiveError Constant
-hi link ngxDirectiveDeprecated Error
-hi link ngxDirective Identifier
-hi link ngxDirectiveThirdParty Special
-
-let b:current_syntax = "nginx"
diff --git a/vim/syntax/srt.vim b/vim/syntax/srt.vim
deleted file mode 100644
index 8192a6c..0000000
--- a/vim/syntax/srt.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Vim syntax file
-" Language:	Syntax highlighting for subtitle files in Subrip (srt) format
-" Maintainer:	Josip Deanovic <djosip@croadria.com>
-" Last Change:	2003 Jun 28
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if !exists("main_syntax")
-  if version < 600
-     syntax clear
-  elseif exists("b:current_syntax")
-     finish
-  endif
-  let main_syntax = 'srt'
-endif
-
-
-syn case ignore
-
-
-syn match srtComment "^#.*"
-syn match srtNumber "^[0-9]*$"
-syn match srtArrow " --> "
-syn region transparent matchgroup=srtTime start='[0-9]*:[0-9]*:[0-9]*,[0-9]*' end='[0-9]*:[0-9]*:[0-9]*,[0-9]*' contains=srtArrow
-syn match srtError "{y:[bi]}"
-syn match srtError "{y:[bi][bi]}"
-syn match srtError "\[br\]"
-
-
-if main_syntax == "srt"
-   syn sync minlines=10
-endif
-
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_srt_syn_inits")
-  if version < 508
-     let did_srt_syn_inits = 1
-     command -nargs=+ HiLink hi link <args>
-  else
-     command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink srtComment Comment
-  HiLink srtNumber Number
-  HiLink srtArrow Statement
-  HiLink srtTime Type
-  HiLink srtError Error
-  delcommand HiLink
-
-endif
-
-let b:current_syntax = "srt"
-
-if main_syntax == 'srt'
-   unlet main_syntax
-endif
-
-" vim: ts=8
-
diff --git a/vim/syntax/srt.vim-1.0/COPYING b/vim/syntax/srt.vim-1.0/COPYING
deleted file mode 100644
index d60c31a..0000000
--- a/vim/syntax/srt.vim-1.0/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/vim/syntax/srt.vim-1.0/README b/vim/syntax/srt.vim-1.0/README
deleted file mode 100644
index 1a83d45..0000000
--- a/vim/syntax/srt.vim-1.0/README
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-QUICK INSTALL:
-
-1. Copy srt.vim file to /usr/share/vim/vim61/syntax directory (path depends
-   on version of vim you are using).
-2. Add those lines to your ~/.vimrc file:
-   " Syntax highlighting for subtitle files in Subrip (srt) format
-   au BufNewFile,BufRead *.srt setf srt
-3. Now you can open some .srt file and syntax highlighting should be working.
-
-
-Vim is extended and improved version of one of the first full screen text
-editors which today comes with all unix like systems. Among huge number of
-options which makes vim very powerful text editor, vim also supports syntax
-highlighting which is implemented on the way which makes creating new, or
-modifying existing highlighting extensions very easy.
-
-I was playing with divx for some time and sometimes I had to modify .srt
-files. Some specialized editors for .srt files imports their own extensions
-which could not be understood by divx players I used. To make errors like this
-or missing brackets easier to encounter, I wrote a syntax file for vim, which
-helped me a lot and maybe will be of use to somebody else.
-srt.vim is a project similar to sub.vim but sub.vim has been written a long
-before srt.vim. This is the reason for having two projects for similar things.
-
-To make coloring syntax of .srt files working, you just have to copy srt.vim
-to the /usr/share/vim/vim61/syntax directory (path depends on version of vim
-you have) and to add those lines to your ~/.vimrc file:
-  " Syntax highlighting for subtitle files in Subrip (srt) format
-  au BufNewFile,BufRead *.srt setf srt
-
diff --git a/vim/vimrc b/vim/vimrc
index 28e321e..ffd4c24 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,9 +1,12 @@
 " ##############################################################################
-" .config/vim/vimrc - Vim configuration
+" vim/vimrc - Vim configuration
 "
 " author: mutantmonkey <mutantmonkey@mutantmonkey.in>
 " ##############################################################################
 
+" Pathogen needs to run first
+execute pathogen#infect()
+
 " General Settings {{{
 set nocompatible					" Disable vi-compatible mode
 set hidden							" Switch buffers without saving
@@ -22,8 +25,6 @@ set t_Co=256						" Use 256 colors
 
 if $TERM =~ "256color" || has('gui_running')
 	colorscheme zenburn
-else
-	colorscheme darkdot
 endif
 " }}}
 
@@ -128,13 +129,7 @@ set smartcase
 
 " Plugins {{{
 
-" NERDCommenter {{{
-set runtimepath+=/home/mutantmonkey/.dotfiles/vim/plugin-git/nerdcommenter/
-" }}}
-
 " NERDTree {{{
-set runtimepath+=/home/mutantmonkey/.dotfiles/vim/plugin-git/nerdtree/
-
 " Have NERDTree change directory when we do
 let g:NERDTreeChDirMode = 2
 
@@ -153,15 +148,9 @@ nmap <leader>N :NERDTreeClose<CR>
 " }}}
 
 " SnipMate {{{
-set runtimepath+=/home/mutantmonkey/.dotfiles/vim/plugin-git/snipmate/
-set runtimepath+=/home/mutantmonkey/.dotfiles/vim/plugin-git/snipmate/after/
-
 let g:snips_author ='mutantmonkey'
 let g:snips_email = 'mutantmonkey@mutantmonkey.in'
-let g:snippets_dir = "/home/mutantmonkey/.dotfiles/vim/snippets"
 " }}}
 
-set runtimepath+=$VIMHOME/after/
-
 " }}}